diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e7bbddb..d6c5c17 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -175,7 +175,6 @@
     <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
     <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />
     <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" />
-    <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
 
     <application android:name="PhoneApp"
             android:persistent="true"
@@ -534,6 +533,12 @@
             </intent-filter>
         </service>
 
+        <receiver android:name="com.android.services.telephony.sip.SipIncomingCallReceiver">
+            <intent-filter>
+                <action android:name="com.android.phone.SIP_INCOMING_CALL" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name="com.android.services.telephony.sip.SipPhoneAccountSettingsActivity"
                 android:theme="@android:style/Theme.NoDisplay"
                 android:excludeFromRecents="true">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5a9a2ca..aba4742 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobiele netwerk is nie beskikbaar nie. Koppel aan \'n draadlose netwerk om \'n oproep te maak."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Voer \'n geldige nommer in om \'n oproep te maak."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Oproep het misluk."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Oproep kan nie op die oomblik bygevoeg word nie."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Diens word nie gesteun nie"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan nie oproepe wissel nie."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan nie oproep skei nie."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8ca385f..5bfbe1f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም። ጥሪ ለማድረግ ከሽቦ አልባ አውታረ መረብ ጋር ያገናኙ።"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"አንድ ጥሪ ለማድረግ የሚሰራ ቁጥር ያስገቡ።"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ጥሪ አልተሳካም።"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ጥሪ በአሁኑ ጊዜ ሊታከል አይችልም።"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"አገልግሎት አይደገፍም"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ጥሪዎችን መቀያየር አልተቻለም።"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ጥሪን መለየት አልተቻለም።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cd75a94..c3a4097 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -150,7 +150,7 @@
     <string name="voicemail_default" msgid="2001233554889016880">"مشغل شبكة الجوّال"</string>
     <string name="vm_change_pin_old_pin" msgid="7295220109886682573">"رقم التعريف الشخصي القديم"</string>
     <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"رقم التعريف الشخصي الجديد"</string>
-    <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"الرجاء الانتظار."</string>
+    <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"يُرجى الانتظار."</string>
     <string name="vm_change_pin_error_too_short" msgid="5974971097302710497">"رقم التعريف الشخصي الجديد قصير جدًا."</string>
     <string name="vm_change_pin_error_too_long" msgid="8476870806115051865">"رقم التعريف الشخصي الجديد طويل جدًا."</string>
     <string name="vm_change_pin_error_too_weak" msgid="7883744811891784882">"رقم التعريف الشخصي الجديد ضعيف جدًا. لا ينبغي أن تكون كلمة المرور القوية عبارة عن تسلسل متتالٍ أو أرقام متكررة."</string>
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"شبكة الجوّال ليست متوفرة. اتصل بشبكة لاسلكية لإجراء مكالمة."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"لإجراء مكالمة، أدخل رقمًا صالحًا."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"أخفقت المكالمة."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"لا يمكن إضافة مكالمة في الوقت الحالي."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"الخدمة ليست متوفرة"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"يتعذر تبديل المكالمات."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"يتعذر فصل المكالمة."</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index dd2ace9..33804c9 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"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="5891978320269774095">"Zəng alınmadı."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Hazırda çağrı edilə bilməz."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <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>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bce650f..8031f46 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilna mreža nije dostupna. Povežite se na bežičnu da biste uputili poziv."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Da biste uputili poziv, unesite važeći broj."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Poziv nije uspeo."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Trenutno nije moguće dodati poziv."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Usluga nije podržana"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Zamena poziva nije uspela."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Razdvajanje poziva nije uspelo."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b3201fc..a0fc8af 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -221,7 +221,7 @@
     <string name="roaming_warning" msgid="1603164667540144353">"Гэта можа прывесці да значных выдаткаў."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дазволіць перадачу даных у роўмінгу?"</string>
     <string name="data_usage_title" msgid="8759619109516889802">"Выкарыстанне даных"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> мабільны трафік, выкарыстаны ў перыяд <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> мабільнага трафіку выкарыстана ў перыяд <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Пашыраныя налады"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Аператар"</string>
     <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"аператар, esim, sim, euicc"</string>
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мабільная сетка недаступная. Падлучыцеся да бесправадной сеткі, каб зрабіць выклік."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Каб зрабіць выклік, увядзіце сапраўдны нумар."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Збой выклiку."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Зараз немагчыма дадаць выклік."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Служба не падтрымліваецца"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Немагчыма пераключыць выклікі."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Немагчыма аддзяліць выклік."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 97a326a..c120638 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Няма мобилна мрежа. Свържете се с безжична, за да се обадите."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да извършите обаждане, въведете валиден номер."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Обаждането не бе успешно."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Понастоящем обаждането не може да бъде добавено."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Услугата не се поддържа"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Обажданията не могат да се превключат."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Обаждането не може да се отдели."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 554766a..54bfa9b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"মোবাইল নেটওয়ার্ক উপলব্ধ নেই৷ একটি কল করতে কোনো ওয়্যারলেস নেটওয়ার্কে সংযোগ করুন৷"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"কোনো কল স্থাপন করতে, একটি বৈধ নম্বর লিখুন৷"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"কল ব্যর্থ হয়েছে৷"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"এই মুহূর্তে কল যোগ করা যাবে না৷"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"পরিষেবা সমর্থিত নয়"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"কলগুলি স্যুইচ করা যাবে না৷"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"কল আলাদা করা যাবে না৷"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5ac0f52..d0b3296 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilna mreža nije dostupna. Povežite se na bežičnu mrežu da uputite poziv."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Da uputite poziv, upišite važeći broj."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Poziv nije uspio."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Trenutno nije moguće dodati poziv."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Usluga nije podržana"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nije moguće prebacivanje poziva."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nije moguće odvojiti poziv."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2f0d73d..9c50d62 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"La xarxa mòbil no està disponible. Per fer una trucada, connecta\'t a una xarxa sense fil."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Per realitzar una trucada, introdueix un número vàlid."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"No s\'ha pogut fer la trucada."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"En aquest moment no es pot afegir la trucada."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"El servei no és compatible."</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No es pot canviar de trucada."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No es pot separar la trucada."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7125d83..efba4c1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilní síť není k dispozici. Pokud chcete provést hovor, připojte se k bezdrátové síti."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Chcete-li uskutečnit hovor, zadejte platné telefonní číslo."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Volání se nezdařilo."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Hovor teď není možné přidat."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Služba není podporována."</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Hovory nelze přepnout."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Hovor nelze rozdělit."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bc92a65..8105652 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilnetværk er ikke tilgængeligt. Opret forbindelse til et trådløst netværk for at foretage et opkald."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Indtast et gyldigt nummer for at foretage et opkald."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Opkald mislykkedes."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Opkaldet kan ikke tilføjes på nuværende tidspunkt."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjenesten er ikke understøttet"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan ikke skifte opkald."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan ikke adskille opkald."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8c96399..64d9377 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -221,7 +221,7 @@
     <string name="roaming_warning" msgid="1603164667540144353">"Es können hohe Gebühren anfallen."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Daten-Roaming zulassen?"</string>
     <string name="data_usage_title" msgid="8759619109516889802">"Datennutzung"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobile Daten genutzt im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g> genutzte mobile Daten: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Erweitert"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobilfunkanbieter"</string>
     <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"Anbieter, esim, sim, euicc"</string>
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Es ist kein Mobilfunknetz verfügbar. Stelle zum Telefonieren eine WLAN-Verbindung her."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Gib eine gültige Nummer ein."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Fehler beim Anruf."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Der Anruf kann momentan nicht hinzugefügt werden."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Dienst wird nicht unterstützt"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Anruf kann nicht gewechselt werden."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Anruf kann nicht getrennt werden."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b2aaa54..8010f19 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο. Συνδεθείτε σε ένα ασύρματο δίκτυο για να πραγματοποιήσετε μια κλήση."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Για να πραγματοποιήσετε κλήση, εισαγάγετε έναν έγκυρο αριθμό."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Η κλήση απέτυχε."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Δεν είναι δυνατή η προσθήκη κλήσης αυτήν τη στιγμή."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Η υπηρεσία δεν υποστηρίζεται"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Δεν είναι δυνατή η εναλλαγή κλήσεων."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Δεν είναι δυνατός ο διαχωρισμός της κλήσης."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 4bcbdff..aaef679 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobile network isn\'t available. Connect to a wireless network to make a call."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Call failed."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Call cannot be added at the moment."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-en-rCA/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">"Global"</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-en-rCA/config.xml b/res/values-en-rCA/config.xml
new file mode 100644
index 0000000..509a3c8
--- /dev/null
+++ b/res/values-en-rCA/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<!--  NOTE: Many variables that used to be in this file have been migrated to
+     CarrierConfigManager.java. Please consider whether new variables belong
+     there before adding to this file. Variables here should be more closely
+     related to devices than to networks.  -->
+
+<!--  Phone app resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="system_visual_voicemail_client" msgid="1787338073957698459"></string>
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..aaef679
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,614 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Mobile Data"</string>
+    <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Phone Services"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Emergency Dialler"</string>
+    <string name="phoneIconLabel" msgid="2331230813161304895">"Phone"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"FDN list"</string>
+    <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
+    <string name="private_num" msgid="6713286113000232309">"Private number"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
+    <string name="onHold" msgid="9035493194749959955">"On hold"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"MMI code started"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"USSD code running…"</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"MMI code cancelled"</string>
+    <string name="cancel" msgid="5044513931633602634">"Cancel"</string>
+    <string name="enter_input" msgid="1810529547726803893">"USSD message must be between <xliff:g id="MIN_LEN">%d</xliff:g> and <xliff:g id="MAX_LEN">%d</xliff:g> characters. Please try again."</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
+    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handset earpiece"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired headset"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Send the following tones?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sending tones\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"Send"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"Yes"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Replace wild character with"</string>
+    <string name="no_vm_number" msgid="4164780423805688336">"Missing voicemail number"</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"No voicemail number is stored on the SIM card."</string>
+    <string name="add_vm_number_str" msgid="4676479471644687453">"Add number"</string>
+    <string name="voice_number_setting_primary_user_only" msgid="6596604364907022416">"Voicemail settings can only be modified by the primary user."</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"Your SIM card has been unblocked. Your phone is unlocking…"</string>
+    <string name="label_ndp" msgid="780479633159517250">"SIM network unlock PIN"</string>
+    <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Unlock"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Dismiss"</string>
+    <string name="requesting_unlock" msgid="6412629401033249351">"Requesting network unlock…"</string>
+    <string name="unlock_failed" msgid="6490531697031504225">"Network unlock request unsuccessful."</string>
+    <string name="unlock_success" msgid="6770085622238180152">"Network unlock successful."</string>
+    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobile network settings are not available for this user"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM call settings"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA call settings"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Access point names"</string>
+    <string name="settings_label" msgid="3876743539816984008">"Network settings"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Calling accounts"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Make calls with"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Make SIP calls with"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Ask first"</string>
+    <string name="phone_accounts_default_account_label" msgid="4183772241814460014">"No network available"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Settings"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Choose accounts"</string>
+    <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="connection_service_default_label" msgid="1498481943805913754">"Built-in connection service"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Voicemail"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
+    <string name="voicemail_notifications_preference_title" msgid="4019728578955102213">"Notifications"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Emergency broadcasts"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Call settings"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Additional settings"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Additional settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Additional GSM-only call settings"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Additional CDMA call settings"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Additional CDMA-only call settings"</string>
+    <string name="labelNwService" msgid="4699970172021870983">"Network service settings"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Caller ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Loading settings…"</string>
+    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Number hidden in outgoing calls"</string>
+    <string name="sum_show_caller_id" msgid="6768534125447290401">"Number displayed in outgoing calls"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Use default operator settings to display my number in outgoing calls"</string>
+    <string name="labelCW" msgid="6120513814915920200">"Call waiting"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"During a call, notify me of incoming calls"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"During a call, notify me of incoming calls"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Call-forwarding settings"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Call forwarding settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCF" msgid="2574386948026924737">"Call forwarding"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Always forward"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Always use this number"</string>
+    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Forwarding all calls"</string>
+    <string name="sum_cfu_enabled" msgid="2450052502198827927">"Forwarding all calls to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Number is unavailable"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Off"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"When busy"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Number when busy"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Forwarding to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Off"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Your operator doesn\'t support disabling call forwarding when your phone is busy."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"When unanswered"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Number when unanswered"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Forwarding to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Off"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Your operator doesn\'t support disabling call forwarding when your phone doesn\'t answer."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"When unreachable"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Number when unreachable"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Forwarding to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Off"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Your operator doesn\'t support disabling call forwarding when your phone is unreachable."</string>
+    <string name="updating_title" msgid="6146755386174019046">"Call settings"</string>
+    <string name="call_settings_admin_user_only" msgid="4526094783818216374">"Call settings can only be changed by the admin user."</string>
+    <string name="call_settings_with_label" msgid="3401177261468593519">"Settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="error_updating_title" msgid="7970259216988931777">"Call settings error"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Reading settings…"</string>
+    <string name="updating_settings" msgid="8171225533884883252">"Updating settings…"</string>
+    <string name="reverting_settings" msgid="4752151682666912828">"Reverting settings…"</string>
+    <string name="response_error" msgid="6674110501330139405">"Unexpected response from network."</string>
+    <string name="exception_error" msgid="7027667130619518211">"Network or SIM card error."</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS request modified to DIAL request."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS request modified to USSD request."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS request modified to new SS request."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s fixed dialling numbers setting is turned on. As a result, some call-related features aren\'t working."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Please turn on the radio before viewing these settings."</string>
+    <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
+    <string name="enable" msgid="7248657275000173526">"Turn on"</string>
+    <string name="disable" msgid="4678348128118573672">"Turn off"</string>
+    <string name="change_num" msgid="239476305819844391">"Update"</string>
+  <string-array name="clir_display_values">
+    <item msgid="5560134294467334594">"Network default"</item>
+    <item msgid="7876195870037833661">"Hide number"</item>
+    <item msgid="1108394741608734023">"Show number"</item>
+  </string-array>
+    <string name="vm_changed" msgid="380744030726254139">"Voicemail number changed."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Couldn\'t change the voicemail number.\nContact your operator if this problem persists."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Couldn\'t change the forwarding number.\nContact your operator if this problem persists."</string>
+    <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Couldn\'t retrieve and save current forwarding number settings.\nSwitch to the new provider anyway?"</string>
+    <string name="no_change" msgid="3186040086622435212">"No changes were made."</string>
+    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Choose voicemail service"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Your operator"</string>
+    <string name="vm_change_pin_old_pin" msgid="7295220109886682573">"Old PIN"</string>
+    <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"New PIN"</string>
+    <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"Please wait."</string>
+    <string name="vm_change_pin_error_too_short" msgid="5974971097302710497">"The new PIN is too short."</string>
+    <string name="vm_change_pin_error_too_long" msgid="8476870806115051865">"The new PIN is too long."</string>
+    <string name="vm_change_pin_error_too_weak" msgid="7883744811891784882">"The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits."</string>
+    <string name="vm_change_pin_error_mismatch" msgid="2754685537970757317">"The old PIN doesn\'t match."</string>
+    <string name="vm_change_pin_error_invalid" msgid="3972205462701668653">"The new PIN contains invalid characters."</string>
+    <string name="vm_change_pin_error_system_error" msgid="6610603326230000207">"Unable to change PIN"</string>
+    <string name="vvm_unsupported_message_format" msgid="11795090778411977">"Unsupported message type. Call <xliff:g id="NUMBER">%s</xliff:g> to listen."</string>
+    <string name="mobile_networks" msgid="5540397602919106177">"Mobile network settings"</string>
+    <string name="network_settings_title" msgid="514120489499925574">"Mobile network"</string>
+    <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
+    <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Error while searching for networks."</string>
+    <string name="register_on_network" msgid="9055203954040805084">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
+    <string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
+    <string name="select_automatically" msgid="1046727200631770962">"Automatically select network"</string>
+    <string name="network_select_title" msgid="7733107364757544558">"Network"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferred network mode: WCDMA preferred"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferred network mode: GSM only"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferred network mode: WCDMA only"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"Preferred network mode: GSM/WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"Preferred network mode: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferred network mode: CDMA/EvDo"</string>
+    <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferred network mode: CDMA only"</string>
+    <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferred network mode: EvDo only"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferred network mode: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferred network mode: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferred network mode: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferred network mode: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferred network mode: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferred network mode: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferred network mode: LTE/CDMA"</string>
+    <string name="preferred_network_mode_tdscdma_summary" msgid="8021016193718678775">"Preferred network mode: TDSCDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo only"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"WCDMA only"</item>
+    <item msgid="1524224863879435516">"GSM only"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
+  </string-array>
+    <string name="call_category" msgid="5863978196309462052">"Calling"</string>
+    <string name="network_operator_category" msgid="4830701959205735636">"Network"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Advanced calling"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Use LTE services to improve voice and other communications (recommended)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Data enabled"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Allow data usage"</string>
+    <string name="dialog_alert_title" msgid="6751344986194435476">"Attention"</string>
+    <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Connect to data services when roaming"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Connect to data services when roaming"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Data usage"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="advanced_options_title" msgid="8074895510265488035">"Advanced"</string>
+    <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"carrier, esim, sim, euicc"</string>
+    <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
+    <string name="mobile_data_settings_title" msgid="4661165467914727157">"Mobile data"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Access data using mobile network"</string>
+    <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Turn off mobile data?"</string>
+    <string name="sim_selection_required_pref" msgid="7049424902961844236">"Selection required"</string>
+    <string name="sim_change_data_title" msgid="5332425991853799280">"Change data SIM?"</string>
+    <string name="sim_change_data_message" msgid="2163963581444907496">"Use <xliff:g id="NEW_SIM">%1$s</xliff:g> instead of <xliff:g id="OLD_SIM">%2$s</xliff:g> for mobile data?"</string>
+    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"Wi-Fi calling"</string>
+    <string name="video_calling_settings_title" msgid="539714564273795574">"Carrier video calling"</string>
+    <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS Options"</string>
+    <string name="cdma_options" msgid="4016822858172249884">"CDMA Options"</string>
+    <string name="throttle_data_usage" msgid="3715677828160555808">"Data usage"</string>
+    <string name="throttle_current_usage" msgid="8762280193043815361">"Data used in current period"</string>
+    <string name="throttle_time_frame" msgid="1915198770363734685">"Data usage period"</string>
+    <string name="throttle_rate" msgid="4710388992676803508">"Data rate policy"</string>
+    <string name="throttle_help" msgid="243651091785169900">"Learn more"</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>٪) of <xliff:g id="USED_2">%3$s</xliff:g> period maximum\nNext period starts in <xliff:g id="USED_3">%4$d</xliff:g> days (<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>٪) of <xliff:g id="USED_2">%3$s</xliff:g> period maximum"</string>
+    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum exceeded\nData rate reduced to <xliff:g id="USED_1">%2$d</xliff:g> Kb/s"</string>
+    <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ of cycle elapsed\nNext period starts in <xliff:g id="USED_1">%2$d</xliff:g> days (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
+    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Data rate reduced to <xliff:g id="USED">%1$d</xliff:g> Kb/s if data usage limit is exceeded"</string>
+    <string name="throttle_help_subtext" msgid="5217706521499010816">"More information about your operator\'s mobile network data usage policy"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"Mobile Broadcast SMS"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Mobile Broadcast SMS"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Mobile Broadcast SMS enabled"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"Mobile Broadcast SMS disabled"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Mobile Broadcast SMS settings"</string>
+    <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Emergency Broadcast"</string>
+    <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Emergency Broadcast enabled"</string>
+    <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Emergency Broadcast disabled"</string>
+    <string name="enable_disable_administrative" msgid="6501582322182059412">"Administrative"</string>
+    <string name="administrative_enable" msgid="1750086122962032235">"Administrative enabled"</string>
+    <string name="administrative_disable" msgid="8433273857248698539">"Administrative disabled"</string>
+    <string name="enable_disable_maintenance" msgid="1819693083025106678">"Maintenance"</string>
+    <string name="maintenance_enable" msgid="8566636458770971189">"Maintenance enabled"</string>
+    <string name="maintenance_disable" msgid="7340189100885066077">"Maintenance disabled"</string>
+    <string name="general_news_settings" msgid="4968779723948432978">"General News"</string>
+    <string name="bf_news_settings" msgid="3935593091894685267">"Business and Financial News"</string>
+    <string name="sports_news_settings" msgid="7649399631270052835">"Sports News"</string>
+    <string name="entertainment_news_settings" msgid="5051153952959405035">"Entertainment News"</string>
+    <string name="enable_disable_local" msgid="7890281063123416120">"Local"</string>
+    <string name="local_enable" msgid="6370463247609136359">"Local news enabled"</string>
+    <string name="local_disable" msgid="4405691986943795798">"Local news disabled"</string>
+    <string name="enable_disable_regional" msgid="4905652414535565872">"Regional"</string>
+    <string name="regional_enable" msgid="4434680415437834759">"Regional news enabled"</string>
+    <string name="regional_disable" msgid="5359325527213850077">"Regional news disabled"</string>
+    <string name="enable_disable_national" msgid="236278090206880734">"National"</string>
+    <string name="national_enable" msgid="1172443648912246952">"National news enabled"</string>
+    <string name="national_disable" msgid="326018148178601166">"National news disabled"</string>
+    <string name="enable_disable_international" msgid="7535348799604565592">"International"</string>
+    <string name="international_enable" msgid="5855356769925044927">"International news enabled"</string>
+    <string name="international_disable" msgid="2850648591041088931">"International news disabled"</string>
+    <string name="list_language_title" msgid="2841683501919760043">"Language"</string>
+    <string name="list_language_summary" msgid="8109546531071241601">"Select the news language"</string>
+  <string-array name="list_language_entries">
+    <item msgid="6137851079727305485">"English"</item>
+    <item msgid="1151988412809572526">"French"</item>
+    <item msgid="577840534704312665">"Spanish"</item>
+    <item msgid="8385712091143148180">"Japanese"</item>
+    <item msgid="1858401628368130638">"Korean"</item>
+    <item msgid="1933212028684529632">"Chinese"</item>
+    <item msgid="1908428006803639064">"Hebrew"</item>
+  </string-array>
+  <string-array name="list_language_values">
+    <item msgid="1804908636436467150">"1"</item>
+    <item msgid="289708030346890334">"2"</item>
+    <item msgid="1121469729692402684">"3"</item>
+    <item msgid="2614093115912897722">"4"</item>
+    <item msgid="2411164639857960614">"5"</item>
+    <item msgid="5884448729274543324">"6"</item>
+    <item msgid="5511864807618312598">"7"</item>
+  </string-array>
+    <string name="list_language_dtitle" msgid="5442908726538951934">"Languages"</string>
+    <string name="enable_disable_local_weather" msgid="986967454867219114">"Local Weather"</string>
+    <string name="local_weather_enable" msgid="6199315114382448922">"Local Weather enabled"</string>
+    <string name="local_weather_disable" msgid="2510158089142626480">"Local Weather disabled"</string>
+    <string name="enable_disable_atr" msgid="8339572391278872343">"Area Traffic Reports"</string>
+    <string name="atr_enable" msgid="5541757457789181799">"Area Traffic Reports enabled"</string>
+    <string name="atr_disable" msgid="7085558154727596455">"Area Traffic Reports disabled"</string>
+    <string name="enable_disable_lafs" msgid="668189073721277199">"Local Airport Flight Schedules"</string>
+    <string name="lafs_enable" msgid="2791978667205137052">"Local Airport Flight Schedules enabled"</string>
+    <string name="lafs_disable" msgid="2391212397725495350">"Local Airport Flight Schedules disabled"</string>
+    <string name="enable_disable_restaurants" msgid="6240381945336814024">"Restaurants"</string>
+    <string name="restaurants_enable" msgid="5137657479469118847">"Restaurants enabled"</string>
+    <string name="restaurants_disable" msgid="3678480270938424092">"Restaurants disabled"</string>
+    <string name="enable_disable_lodgings" msgid="1822029172658551202">"Lodgings"</string>
+    <string name="lodgings_enable" msgid="3230042508992850322">"Lodgings enabled"</string>
+    <string name="lodgings_disable" msgid="3387879742320682391">"Lodgings disabled"</string>
+    <string name="enable_disable_retail_directory" msgid="1357809784475660303">"Retail Directory"</string>
+    <string name="retail_directory_enable" msgid="3280626290436111496">"Retail Directory enabled"</string>
+    <string name="retail_directory_disable" msgid="6479739816662879027">"Retail Directory disabled"</string>
+    <string name="enable_disable_advertisements" msgid="5999495926176182128">"Advertisements"</string>
+    <string name="advertisements_enable" msgid="2050305021264683786">"Advertisements enabled"</string>
+    <string name="advertisements_disable" msgid="8350985908788707935">"Advertisements disabled"</string>
+    <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"Share Quotes"</string>
+    <string name="stock_quotes_enable" msgid="4384802470887170543">"Share Quotes enabled"</string>
+    <string name="stock_quotes_disable" msgid="4781450084565594998">"Share Quotes disabled"</string>
+    <string name="enable_disable_eo" msgid="4863043263443942494">"Employment Opportunities"</string>
+    <string name="eo_enable" msgid="8623559062015685813">"Employment Opportunities enabled"</string>
+    <string name="eo_disable" msgid="3863812478090907609">"Employment Opportunities disabled"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medical, Health and Hospital"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medical, Health and Hospital enabled"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medical, Health and Hospital disabled"</string>
+    <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technology News"</string>
+    <string name="technology_news_enable" msgid="7995209394210455181">"Technology News enabled"</string>
+    <string name="technology_news_disable" msgid="5483490380561851946">"Technology News disabled"</string>
+    <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-category"</string>
+    <string name="multi_category_enable" msgid="1179299804641721768">"Multi-category enabled"</string>
+    <string name="multi_category_disable" msgid="880104702904139505">"Multi-category disabled"</string>
+    <string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Global"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
+    <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="176474317493999285">"Home only"</item>
+    <item msgid="1205664026446156265">"Automatic"</item>
+  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA subscription"</string>
+    <string name="cdma_subscription_summary" msgid="2530890766115781140">"Change between RUIM/SIM and NV"</string>
+    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"subscription"</string>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="2258014151300708431">"RUIM/SIM"</item>
+    <item msgid="5127722015571873880">"NV"</item>
+  </string-array>
+  <string-array name="cdma_subscription_values">
+    <item msgid="7494167883478914080">"0"</item>
+    <item msgid="6043847456049107742">"1"</item>
+  </string-array>
+    <string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
+    <string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
+    <string name="fdn" msgid="7878832555095183202">"Fixed dialling numbers"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fixed dialling numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN list (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Fixed dialling numbers are enabled"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Fixed dialling numbers are disabled"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Enable FDN"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Disable FDN"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"Change PIN2"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"Disable FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Enable FDN"</string>
+    <string name="sum_fdn" msgid="1959399454900272878">"Manage fixed dialling numbers"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Change PIN for FDN access"</string>
+    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Manage phone number list"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Voice privacy"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"Enable enhanced privacy mode"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY mode"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Set TTY mode"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Auto-retry"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Enable Auto-retry mode"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY Mode change is not allowed during a video call"</string>
+    <string name="menu_add" msgid="1882023737425114762">"Add contact"</string>
+    <string name="menu_edit" msgid="7143003705504672374">"Edit contact"</string>
+    <string name="menu_delete" msgid="3977150783449642851">"Delete contact"</string>
+    <string name="menu_dial" msgid="3223106222819685808">"Dial contact"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Type PIN2"</string>
+    <string name="name" msgid="7329028332786872378">"Name"</string>
+    <string name="number" msgid="7905950798349903858">"Number"</string>
+    <string name="save" msgid="4094274636321939086">"Save"</string>
+    <string name="add_fdn_contact" msgid="2481915899633353976">"Add fixed dialling number"</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"Adding fixed dialling number…"</string>
+    <string name="fdn_contact_added" msgid="7458335758501736665">"Fixed dialling number added."</string>
+    <string name="edit_fdn_contact" msgid="7976936035587081480">"Edit fixed dialling number"</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"Updating fixed dialling number…"</string>
+    <string name="fdn_contact_updated" msgid="5497828782609005017">"Fixed dialling number updated."</string>
+    <string name="delete_fdn_contact" msgid="6668958073074151717">"Delete fixed dialling number"</string>
+    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Deleting fixed dialling number…"</string>
+    <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fixed dialling number deleted."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
+    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN wasn\'t updated because the number is empty or exceeds 20 digits."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"No contacts on your SIM card."</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Select contacts to import"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Turn off aeroplane mode to import contacts from the SIM card."</string>
+    <string name="enable_pin" msgid="5422767284133234860">"Enable/disable SIM PIN"</string>
+    <string name="change_pin" msgid="9174186126330785343">"Change SIM PIN"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"Old PIN"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"New PIN"</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"Confirm new PIN"</string>
+    <string name="badPin" msgid="8955102849303984935">"The old PIN that you typed isn\'t correct. Try again."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"The PINs that you typed don\'t match. Try again."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"Type a PIN that is 4 to 8 numbers."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Clear SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Set SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Setting PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN set"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN cleared"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrect"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN updated"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Password incorrect. PIN now blocked. PUK requested."</string>
+    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"Old PIN2"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"New PIN2"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"Confirm new PIN2"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 incorrect. Try again."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Old PIN2 incorrect. Try again."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s don\'t match. Try again."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Enter a PIN2 that is 4 to 8 numbers."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Enter a PUK2 that is 8 numbers."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 updated"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Enter PUK2 code"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Password incorrect. PIN2 now Blocked. To try again, change PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Password incorrect. SIM now locked. Enter PUK2."</string>
+    <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>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Redialling"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"Conference call"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Incoming call"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Call ended"</string>
+    <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_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="incall_error_power_off" product="watch" msgid="2007450435656211658">"Turn on mobile network, turn off airplane mode or turn off battery saver mode to make a call."</string>
+    <string name="incall_error_power_off" product="default" 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_ecm_emergency_only" msgid="738708660612388692">"Exit emergency callback mode to make a non-emergency call."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
+    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobile network isn\'t available. Connect to a wireless network to make a call."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="5891978320269774095">"Call failed."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Unable to conference calls."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Can\'t hold calls."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
+    <string name="incall_error_promote_wfc" msgid="106510757624022064">"Enable Wi-Fi calling to make a call."</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Turning on radio…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No service. Trying again…"</string>
+    <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Cannot enter aeroplane mode during an emergency call."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dial pad"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Mute"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Add call"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Manage calls"</string>
+    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Manage conference"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
+    <string name="importSimEntry" msgid="6614358325359736031">"Import"</string>
+    <string name="importAllSimEntries" msgid="1503181169636198673">"Import all"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Importing SIM contacts"</string>
+    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Import from contacts"</string>
+    <string name="singleContactImportedMsg" msgid="6868483416182599206">"Imported contact"</string>
+    <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</string>
+    <string name="hac_mode_title" msgid="8740268574688743289">"Hearing aids"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Turn on hearing-aid compatibility"</string>
+  <string-array name="tty_mode_entries">
+    <item msgid="512950011423868021">"TTY off"</item>
+    <item msgid="3971695875449640648">"TTY full"</item>
+    <item msgid="1937509904407445684">"TTY HCO"</item>
+    <item msgid="5644925873488772224">"TTY VCO"</item>
+  </string-array>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tones"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"Set the length of DTMF tones"</string>
+  <string-array name="dtmf_tone_entries">
+    <item msgid="899650777817315681">"Normal"</item>
+    <item msgid="2883365539347850535">"Long"</item>
+  </string-array>
+    <string name="network_info_message" msgid="7738596060242881930">"Network message"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Error message"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"Activate your phone"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"A special call needs to be made to activate your phone service. \n\nAfter pressing “Activate”, listen to the instructions provided to activate your phone."</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activating..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"The phone is activating your mobile data service.\n\nThis can take up to 5 minutes."</string>
+    <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Skip activation?"</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time that you turn it on."</string>
+    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Skip"</string>
+    <string name="ota_activate" msgid="1368528132525626264">"Activate"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Phone is activated."</string>
+    <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem with activation"</string>
+    <string name="ota_listen" msgid="162923839877584937">"Follow the spoken instructions until you hear that activation is complete."</string>
+    <string name="ota_speaker" msgid="6904589278542719647">"Speaker"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Programming your phone…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Couldn\'t programme your phone"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"Your phone is now activated. It may take up to 15 minutes for service to start."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Your phone didn\'t activate. \nYou may need to find an area with better coverage (near a window or outside). \n\nTry again or call customer service for more options."</string>
+    <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
+    <string name="ota_call_end" msgid="4537279738134612388">"Back"</string>
+    <string name="ota_try_again" msgid="7685477206465902290">"Try again"</string>
+    <string name="ota_next" msgid="3904945374358235910">"Next"</string>
+    <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
+    <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Entered Emergency Callback Mode"</string>
+    <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Emergency Callback Mode"</string>
+    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Data connection disabled"</string>
+    <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"No data connection until <xliff:g id="COMPLETETIME">%s</xliff:g>"</string>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_1">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?</item>
+      <item quantity="one">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_0">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="COUNT_1">%s</xliff:g> minutes. Do you want to exit now?</item>
+      <item quantity="one">The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="COUNT_0">%s</xliff:g> minute. Do you want to exit now?</item>
+    </plurals>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"The action selected isn\'t available during an emergency call."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Exiting Emergency Callback mode"</string>
+    <string name="alert_dialog_yes" msgid="6674268047820703974">"Yes"</string>
+    <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Dismiss"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Not set&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Other call settings"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"contact photo"</string>
+    <string name="goPrivate" msgid="865837794424530980">"go private"</string>
+    <string name="selectContact" msgid="781975788478987237">"select contact"</string>
+    <string name="not_voice_capable" msgid="2739898841461577811">"Voice calling not supported"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
+    <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Set PIN"</string>
+    <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Change PIN"</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>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Turn on video calling"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"To turn on video calling, you need to enable Enhanced 4G LTE Mode in network settings."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Network settings"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Close"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Emergency calls"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Emergency calling only"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM card, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibility"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Wi-Fi call from"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
+    <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Tap again to open"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
+    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
+    <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"There are too many active calls. Please end or merge existing calls before placing a new one."</string>
+    <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"Unable to connect. Please insert a valid SIM card."</string>
+    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"Wi-Fi connection lost. Call ended."</string>
+    <string name="change_pin_title" msgid="7790232089699034029">"Change Voicemail PIN"</string>
+    <string name="change_pin_continue_label" msgid="2135088662420163447">"Continue"</string>
+    <string name="change_pin_cancel_label" msgid="353535488390948596">"Cancel"</string>
+    <string name="change_pin_ok_label" msgid="6204308560844889926">"OK"</string>
+    <string name="change_pin_enter_old_pin_header" msgid="419179847657548887">"Confirm your old PIN"</string>
+    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"Enter your voicemail PIN to continue."</string>
+    <string name="change_pin_enter_new_pin_header" msgid="2611191814590251532">"Set a new PIN"</string>
+    <string name="change_pin_enter_new_pin_hint" msgid="2322940054329689309">"PIN must be <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> digits long."</string>
+    <string name="change_pin_confirm_pin_header" msgid="8113764019347322170">"Confirm your PIN"</string>
+    <string name="change_pin_confirm_pins_dont_match" msgid="4795052654904027909">"PINs don\'t match"</string>
+    <string name="change_pin_succeeded" msgid="2022852286442211151">"Voicemail PIN updated"</string>
+    <string name="change_pin_system_error" msgid="8308462387154257840">"Unable to set PIN"</string>
+    <string name="mobile_data_status_roaming_turned_off_subtext" msgid="935636805765823307">"Data roaming is turned off"</string>
+    <string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"Data roaming is turned on"</string>
+    <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"Currently roaming, need data plan"</string>
+    <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"Currently roaming, data plan is active"</string>
+    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"No mobile data left"</string>
+    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"No mobile data left"</string>
+    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"Add mobile data through <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"No roaming plan"</string>
+    <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"Add roaming plan through <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"You can add mobile data or a roaming plan through your carrier, <xliff:g id="PROVIDER_NAME">%s</xliff:g>."</string>
+    <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"Add data?"</string>
+    <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"You may need to add data through <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="mobile_data_activate_button" msgid="3682400969184405446">"ADD DATA"</string>
+    <string name="mobile_data_activate_cancel_button" msgid="1708022171547398765">"CANCEL"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4bcbdff..aaef679 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobile network isn\'t available. Connect to a wireless network to make a call."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Call failed."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Call cannot be added at the moment."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4bcbdff..aaef679 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobile network isn\'t available. Connect to a wireless network to make a call."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Call failed."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Call cannot be added at the moment."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index febe813..a636431 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎Mobile network is not available. Connect to a wireless network to make a call.‎‏‎‎‏‎"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎To place a call, enter a valid number.‎‏‎‎‏‎"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎Call failed.‎‏‎‎‏‎"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎Call cannot be added at this time.‎‏‎‎‏‎"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎Service not supported‎‏‎‎‏‎"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎Can\'t switch calls.‎‏‎‎‏‎"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎Can\'t separate call.‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 411ed61..b61cc83 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -221,7 +221,7 @@
     <string name="roaming_warning" msgid="1603164667540144353">"Puede ocasionar gastos importantes."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"¿Deseas permitir el roaming de datos?"</string>
     <string name="data_usage_title" msgid="8759619109516889802">"Uso de datos"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"Datos móviles usados: <xliff:g id="ID_1">%1$s</xliff:g>, entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Datos móviles usados: <xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avanzada"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Proveedor"</string>
     <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"proveedor, esim, sim, euicc"</string>
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"La red móvil no está disponible. Conéctate a una red inalámbrica para realizar una llamada."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar una llamada, ingresa un número válido."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Error en la llamada"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"No se puede agregar la llamada en este momento."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servicio no compatible"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No se puede cambiar llamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No se puede desviar la llamada."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c3d689b..e2ff7b1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"La red móvil no está disponible. Conéctate a una para llamar."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar una llamada, introduce un número válido."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"No se ha podido llamar."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"No se puede añadir la llamada en este momento."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servicio no admitido"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No se pueden intercambiar llamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No se pueden separar llamadas."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 73591f8..237d0a0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobiilsidevõrk pole saadaval. Helistamiseks looge ühendus traadita võrguga."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Helistamiseks sisestage kehtiv number."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Kõne ebaõnnestus."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Kõnet ei saa praegu lisada."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Teenust ei toetata"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kõnesid ei saa vahetada."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kõnet ei saa eraldada."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index ea1cffe..5d9eae2 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Sare mugikorra ez dago erabilgarri. Deia egiteko, konektatu haririk gabeko sare batera."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Deitzeko, idatzi balio duen zenbaki bat."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Ezin izan da deitu."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Une honetan ezin da gehitu deirik."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Ez da zerbitzua onartzen"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ezin da deiz aldatu."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ezin da deia bereizi."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ce70422..3d61073 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"شبکه تلفن همراه دردسترس نیست. برای برقراری تماس به شبکه بی‌سیم متصل شوید."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"برای برقراری تماس، یک شماره معتبر وارد کنید."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"تماس ناموفق بود."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"فعلاً نمی‌توانید تماس اضافه کنید."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"سرویس پشتیبانی نمی‌شود"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"نمی‌توانید بین تماس‌ها جابجا شوید."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"نمی‌توانید تماس را جدا کنید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 464ac8b..06a196d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobiiliverkko ei ole käytettävissä. Yhdistä langattomaan verkkoon, jos haluat soittaa puhelun."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Soita antamalla kelvollinen numero."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Puhelu epäonnistui."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Puhelua ei voi lisätä juuri nyt."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Palvelua ei tueta"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Puhelua ei voi vaihtaa."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Puhelua ei voi erottaa."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d75d514..a79bcc6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Le réseau mobile n\'est pas accessible. Connectez-vous à un réseau sans fil pour effectuer un appel."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pour faire un appel, entrez un numéro valide."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Échec de l\'appel."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Impossible d\'ajouter l\'appel pour le moment."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service non pris en charge"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossible de faire des appels."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossible de séparer les appels."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 35bfdeb..774a8bb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Le réseau mobile n\'est pas disponible. Connectez-vous à un réseau sans fil pour passer un appel."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pour émettre un appel, veuillez saisir un numéro valide."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Échec de l\'appel."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Impossible d\'ajouter un appel pour le moment."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service incompatible"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossible de changer d\'appel."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossible d\'isoler l\'appel."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index a507564..bb12052 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"A rede móbil non está dispoñible. Conéctate a unha rede sen fíos para facer unha chamada."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar unha chamada, introduce un número válido."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Produciuse un erro na chamada."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Non se pode engadir a chamada neste momento."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servizo non compatible"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Non se poden cambiar as chamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Non se pode separar a chamada."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6e4507e..3ab7951 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"મોબાઇલ નેટવર્ક ઉપલબ્ધ નથી. કૉલ કરવા માટે વાયરલેસ નેટવર્ક સાથે કનેક્ટ કરો."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"કૉલ કરવા માટે, માન્ય નંબર દાખલ કરો."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"કૉલ નિષ્ફળ થયો."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"આ સમયે કૉલ ઉમેરી શકાતો નથી."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"સેવા સમર્થિત નથી"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"કૉલ્સ સ્વિચ કરી શકાતા નથી."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"અલગ કૉલ કરી શકાતો નથી."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4f3a71c..661b52f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"मोबाइल नेटवर्क उपलब्‍ध नहीं है. कॉल करने के लिए किसी वायरलेस नेटवर्क से कनेक्‍ट करें."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करने के लिए, मान्‍य नंबर डालें."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"कॉल विफल."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"इस समय कॉल नहीं जोड़ा जा सकता."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"सेवा समर्थित नहीं है"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कॉल स्‍विच नहीं किए जा सकते."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कॉल अलग नहीं किया जा सकता."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4be9359..68b2a44 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilna mreža nije dostupna. Povežite se s bežičnom mrežom da biste uputili poziv."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Unesite važeći broj da biste uspostavili poziv."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Poziv nije uspio."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Poziv trenutačno nije moguć."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Usluga nije podržana"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Prebacivanje poziva nije moguće."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Odvajanje poziva nije moguće."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index de373ef..94c8a26 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"A mobilhálózat nem érhető el. Hívás indításához csatlakozzon egy vezeték nélküli hálózathoz."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Hívásindításhoz adjon meg egy érvényes számot."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Sikertelen hívás."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Jelenleg nem lehet hívást indítani."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"A szolgáltatás nem támogatott"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"A hívások közötti váltás sikertelen."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"A híváselkülönítés sikertelen."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e3dcadb..3c6ee4b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Բջջային ցանցն անհասանելի է: Զանգելու համար միացեք Wi-Fi ցանցին:"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Զանգ կատարելու համար մուտքագրեք ճիշտ համար:"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Զանգը ձախողվեց:"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Այս պահին հնարավոր չէ զանգել:"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Ծառայությունը չի աջակցվում"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Հնարավոր չէ փոխանջատել զանգը:"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Հնարավոր չէ առանձնացնել զանգը:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 98a3cb7..1a3d474 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Jaringan seluler tidak tersedia. Sambungkan ke jaringan nirkabel untuk melakukan panggilan."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Untuk melakukan panggilan telepon, masukkan nomor yang valid."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Telepon gagal."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Panggilan tidak dapat ditambahkan untuk saat ini."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Layanan tidak didukung"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat berganti panggilan telepon."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat memisahkan panggilan telepon."</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index acb4ddf..0b11171 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Farsímakerfi er ekki tiltækt. Tengstu þráðlausu neti til að hringja."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Sláðu inn gilt númer til að hringja símtal."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Tókst ekki að hringja."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Ekki er hægt að bæta símtali við sem stendur."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Þjónusta ekki studd"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ekki hægt að skipta milli símtala."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ekki hægt að aðskilja símtal."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0d1ee80..4f7f0c6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -32,7 +32,7 @@
     <string name="enter_input" msgid="1810529547726803893">"Il messaggio USSD deve essere compreso tra <xliff:g id="MIN_LEN">%d</xliff:g> e <xliff:g id="MAX_LEN">%d</xliff:g> caratteri. Riprova."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestisci audioconferenza"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
-    <string name="audio_mode_speaker" msgid="27649582100085266">"Altoparlante"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Vivavoce"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Auricolare telefono"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auricolare con cavo"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
@@ -221,7 +221,7 @@
     <string name="roaming_warning" msgid="1603164667540144353">"I costi potrebbero essere elevati."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Consentire il roaming dei dati?"</string>
     <string name="data_usage_title" msgid="8759619109516889802">"Utilizzo dati"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"Utilizzo dati del dispositivo mobile <xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Utilizzo dati mobili: <xliff:g id="ID_1">%1$s</xliff:g> nel periodo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avanzate"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatore"</string>
     <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operatore, esim, sim, euicc"</string>
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"La rete cellulare non è disponibile. Connettiti a una rete wireless per effettuare una chiamata."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Per effettuare una chiamata, inserisci un numero valido."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Chiamata non riuscita."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Al momento non è possibile aggiungere la chiamata."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servizio non supportato"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossibile cambiare chiamata."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossibile separare la chiamata."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 95ac544..4616db1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"הרשת הסלולרית לא זמינה. עליך להתחבר לרשת אלחוטית כדי להתקשר."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"כדי להתקשר, הזן מספר טלפון חוקי."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"השיחה נכשלה."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"לא ניתן להוסיף את השיחה כרגע."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"שירות לא נתמך"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"לא ניתן לעבור בין שיחות."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"לא ניתן להפריד שיחה."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7c31d9c..8d3745f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"モバイル ネットワークを利用できません。電話をかけるにはワイヤレス ネットワークに接続してください。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"発信するには、有効な番号を入力してください。"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"発信できませんでした。"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"現在、通話を追加できません。"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"サービスはサポートされていません"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"通話を切り替えられません。"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"通話を分割できません。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index d6d152a..515ddb9 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"მობილური ქსელი მიუწვდომელია. ზარის განსახორციელებლად დაუკავშირდით უსადენო ქსელს."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ზარის განხორციელებისათვის, შეიყვანეთ მოქმედი ნომერი."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ზარი ვერ განხორციელდა."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ამჯერად ზარის დამატება ვერ ხერხდება."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"მომსახურება არ არის მხარდაჭერილი"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ვერ ხორციელდება ზარების გადართვა."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ვერ ხორციელდება ზარის გამოყოფა."</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 03f1bd4..63a3161 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мобильдік желі қолжетімді емес. Қоңырау шалу үшін сымсыз желіге қосылыңыз."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Қоңырау шалу үшін жарамды нөмірді енгізіңіз."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Қоңырау шалынбады."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Қоңырауды қазіргі уақытта қосу мүмкін емес."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Қызметке қолдау көрсетілмейді"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Қоңырауларды ауыстыру мүмкін емес."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Қоңырауды бөлу мүмкін емес."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index cc47839..a47ebf9 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"មិនមានបណ្តាញទូរសព្ទទេ។ ភ្ជាប់ទៅបណ្តាញឥតខ្សែ ដើម្បី​អាច​ហៅ​ទូរសព្ទ​បាន។"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ដើម្បីធ្វើការហៅ បញ្ចូលលេខដែលមានសុពលភាព។"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"បាន​បរាជ័យ​ការ​ហៅ។"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"មិន​អាច​បន្ថែម​​​ការ​ហៅ​ទូរសព្ទ​នៅ​ពេល​នេះ​​បាន​ទេ។"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"សេវាកម្មមិនត្រូវបានគាំទ្រទេ។"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"មិនអាចឆ្លាស់ការហៅបានទេ។"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"មិនអាចបំបែកការហៅបានទេ។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 863830a..36614aa 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯವಿಲ್ಲ. ಕರೆ ಮಾಡಲು ವೈರ್‌ಲೆಸ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ಕರೆಯನ್ನು ಮಾಡಲು, ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ಕರೆ ವಿಫಲವಾಗಿದೆ."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ಕರೆಯನ್ನು ಈ ಸಮಯದಲ್ಲಿ ಸೇರಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"ಸೇವೆಯು ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ಕರೆಯನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 041178b..4f9ed69 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"모바일 네트워크를 사용할 수 없습니다. 전화를 걸려면 무선 네트워크에 연결하세요."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"전화를 걸려면 올바른 번호를 입력하세요."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"전화 연결 실패"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"현재 통화를 추가할 수 없습니다."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"지원되지 않는 서비스입니다."</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"통화를 전환할 수 없습니다."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"통화를 분리할 수 없습니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index baf426b..b5abbef 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мобилдик тармак жеткиликтүү эмес. Чалуу үчүн зымсыз тармакка туташыңыз."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Чалынбай калды."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Бул жолу чалууну кошуу мүмкүн эмес."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Кызмат колдоого алынбайт"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Чалуулар которуштурулбай жатат."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Чалуу бөлүнбөй жатат."</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index aed189f..b9b4551 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"ບໍ່ສາມາດໃຊ້ອິນເຕີເນັດມືຖືໄດ້. ກະລຸນາເຊື່ອມຕໍ່ຫາ Wi-Fi ເພື່ອໂທ."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ເພື່ອ​ທີ່​ຈະ​ໂທ, ປ້ອນ​ເບີ​ໂທ​ທີ່​ໃຊ້​ໄດ້​ເຂົ້າ​ໄປ."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ໂທບໍ່ສຳເລັດ."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ບໍ່ສາມາດເພີ່ມການໂທໄດ້ໃນເວລານີ້."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"ການ​ບໍ​ລິ​ການ​ບໍ່​ຮອງ​ຮັບ"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ບໍ່​ສາ​ມາດ​ສະ​ຫຼັບ​ສາ​ຍ​ໂທ​ໄດ້."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ບໍ່​ສາ​ມາດ​ແຍກ​ສາຍ​ໂທ​ໄດ້."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 167ef9b..4a48625 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobiliojo ryšio tinklas nepasiekiamas. Prisijunkite prie belaidžio ryšio tinklo, kad galėtumėte skambinti."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Kad galėtumėte paskambinti, įveskite tinkamą numerį."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Paskambinti nepavyko."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Šiuo metu skambučio atlikti negalima."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Paslauga nepalaikoma"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nepavyko perjungti skambučių."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nepavyko atskirti skambučio."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0771a55..069f930 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -466,7 +466,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilais tīkls nav pieejams. Lai veiktu zvanu, izveidojiet savienojumu ar bezvadu tīklu."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Lai veiktu zvanu, ievadiet derīgu numuru."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Zvans neizdevās."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Pašlaik nevar pievienot zvanu."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Pakalpojums netiek atbalstīts"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nevar pārslēgt zvanus."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nevar nošķirt zvanu."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index db95794..58b0c71 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Не е достапна мобилна мрежа. Поврзете се на безжична мрежа за да повикате."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да повикате, внесете важечки број."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Повикот не успеа."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Повикот не може да се додаде во моментов."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Услугата не е поддржана"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не може да префрли повици."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не може да оддели повик."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4a217a1..5c8c482 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"മൊബൈൽ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല. കോൾ വിളിക്കാൻ വയർലെസ്സ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ഒരു കോൾ ചെയ്യുന്നതിന്, സാധുതയുള്ള നമ്പർ നൽകുക."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"കോൾ ചെയ്യാനായില്ല."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"കോൾ ഇപ്പോൾ ചേർക്കാനാകില്ല."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"സേവനം പിന്തുണയ്‌ക്കുന്നില്ല"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"കോളുകൾ മാറാനാവില്ല."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"കോൾ വേർതിരിക്കാനാവില്ല."</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 082c809..6efd9cd 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мобайл сүлжээнд холбогдох боломжгүй байна. Дуудлага хийхийн тулд утасгүй интернетэд холбогдоно уу."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Дуудлага хийхийн тулд хүчин төгөлдөр дугаар оруулна уу."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Дуудлага амжилтгүй болсон."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Одоо дуудлага нэмэх боломжгүй."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Үйлчилгээг дэмждэггүй байна"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Дуудлагыг солих боломжгүй байна."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Дуудлагыг салгаж чадахгүй байна."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index fc87a82..90d22d2 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -355,7 +355,7 @@
     <item msgid="7494167883478914080">"0"</item>
     <item msgid="6043847456049107742">"1"</item>
   </string-array>
-    <string name="cdma_activate_device" msgid="3793805892364814518">"डिव्हाइस सक्रिय करा"</string>
+    <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>
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"मोबाइल नेटवर्क उपलब्‍ध नाही. कॉल करण्‍यासाठी वायरलेस नेटवर्कशी कनेक्‍ट करा."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करण्यासाठी, एक वैध नंबर प्रविष्ट करा."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"कॉल अयशस्वी झाला."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"यावेळी कॉल जोडला जाऊ शकत नाही."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"सेवा समर्थित नाही"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कॉल स्विच करू शकत नाही."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कॉल विभक्त करू शकत नाही."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0f3bab2..7aea294 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Rangkaian selular tidak tersedia. Sambung ke rangkaian wayarles untuk membuat panggilan."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Untuk membuat panggilan, masukkan nombor yang sah."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Panggilan gagal."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Panggilan tidak boleh ditambahkan pada masa ini."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Perkhidmatan tidak disokong"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat menukar panggilan."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat mengasingkan panggilan."</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 76d480d..f8a4396 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"မိုဘိုင်းကွန်ရက် မရနိုင်ပါ။ ခေါ်ဆိုမှုပြုလုပ်ရန် ကြိုးမဲ့ကွန်ရက်သို့ ချိတ်ဆက်လိုက်ပါ။"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ခေါ်ဆို၍ မရပါ။"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ယခုအချိန်တွင် ခေါ်ဆိုမှု ထပ်မထည့်နိုင်ပါ။"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ဖုန်းခေါ်ခြင်းများကြား မကူးပ​ြောင်းနိုင်ပါ။"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ဖုန်းခေါ်ခြင်းအား မခွဲထုတ်နိုင်ပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c472ada..d8fe2d6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilnettverk er ikke tilgjengelig. Koble til et trådløst nettverk for å ringe."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Anropet mislyktes."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Anropet kan ikke legges til akkurat nå."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjenesten støttes ikke"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan ikke bytte samtaler."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan ikke splitte opp samtale."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b95540a..20ac92f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"मोबाइल नेटवर्क उपलब्ध छैन। कल गर्न तारविनाको नेटवर्कमा जडान गर्नुहोस्।"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्ट गर्नुहोस्।"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"कल विफल भयो।"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"यतिबेला कल थप गर्न सकिँदैन।"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"सेवा समर्थित छैन"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कल स्विच गर्न सक्दैन।"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कल अलग गर्न सक्दैन।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 150ae32..a7a47f2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobiel netwerk is niet beschikbaar. Maak verbinding met een draadloos netwerk om te bellen."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Als je wilt bellen, moet je een geldig nummer invoeren."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Oproep mislukt."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Oproep kan momenteel niet worden toegevoegd."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service wordt niet ondersteund"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan niet overschakelen tussen oproepen."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan oproep niet scheiden."</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index c8f6014..2da2730 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਕਾਲ ਕਰਨ ਲਈ ਕਿਸੇ ਵਾਇਰਲੈੱਸ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ, ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਨੰਬਰ ਦਰਜ ਕਰੋ।"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ਕਾਲ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ।"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ਇਸ ਵੇਲੇ ਕਾਲ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"ਸੇਵਾ ਸਮਰਥਿਤ ਨਹੀਂ"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ਕਾਲਾਂ ਸਵਿਚ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ਕਾਲ ਵੱਖ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3d727c6..e5ecaa7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Sieć komórkowa jest niedostępna. Połącz się z siecią bezprzewodową, by zadzwonić."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Aby zadzwonić, wybierz prawidłowy numer."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Nie udało się połączyć."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Nie można w tej chwili dodać połączenia."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Usługa nie jest obsługiwana"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nie można przełączyć połączeń."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nie można rozdzielić połączenia."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f47aad3..da5f64c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"A rede móvel não está disponível. Ligue-se a uma rede sem fios para efetuar uma chamada."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para telefonar, introduza um número válido."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"A chamada falhou."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Não é possível adicionar a chamada neste momento."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Serviço não suportado"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Não é possível alternar chamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Não é possível separar a chamada."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e4abba7..c3d0726 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"A rede móvel não está disponível. Conecte-se a uma rede sem fio para fazer uma chamada."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar uma chamada, digite um número válido."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Falha na chamada."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"No momento, não é possível adicionar a chamada."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Serviço não suportado"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Não é possível alternar as chamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Não é possível separar a chamada."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 875aa52..2d2deb7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Rețeaua mobilă nu este disponibilă. Pentru a apela, conectați-vă la o rețea wireless."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pentru a apela, introduceți un număr valid."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Apelul nu a fost inițiat."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Apelul nu poate fi adăugat în acest moment."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Serviciul nu este compatibil"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Apelurile nu pot fi comutate."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Apelul nu poate fi separat."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9952520..403777c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -466,7 +466,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мобильная сеть недоступна. Чтобы позвонить, подключитесь к Wi-Fi."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Недействительный номер."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Не удалось отправить вызов."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Невозможно позвонить в данный момент."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Сервис не поддерживается"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не удалось переключить вызов."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не удалось разделить вызов."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 95a2147..4545cd1 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"ජංගම ජාලය ලබා ගැනීමට නොහැකිය. ඇමතුමක් කිරීමට රැහැන් රහිත ජාලයකට සම්බන්ධ කරන්න."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ඇමතුමක් ලබාගැනීමට, වලංගු අංකයක් ලබාගන්න."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"ඇමතුම අසාර්ථක විය."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ඇමතුම මේ අවස්ථාවේදී එක් කළ නොහැකිය."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"සේවාවට සහාය දක්වන්නේ නැත"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ඇමතුම් මාරු කිරීම කළ නොහැක."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ඇමතුම වෙන් කිරීම කළ නොහැක."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f2b7ef9..b731880 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -240,7 +240,7 @@
     <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>
-    <string name="throttle_help" msgid="243651091785169900">"Viac informácií"</string>
+    <string name="throttle_help" msgid="243651091785169900">"Ďalšie informácie"</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> ٪) z limitu <xliff:g id="USED_2">%3$s</xliff:g> pre obdobie\nPočet dní do začiatku ďalšieho obdobia: <xliff:g id="USED_3">%4$d</xliff:g> (<xliff:g id="USED_4">%5$s</xliff:g>)"</string>
     <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g> ٪) z limitu <xliff:g id="USED_2">%3$s</xliff:g> pre obdobie"</string>
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Bol prekročený limit <xliff:g id="USED_0">%1$s</xliff:g>\nPrenosová rýchlosť bola znížená na <xliff:g id="USED_1">%2$d</xliff:g> kB/s"</string>
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilná sieť nie je k dispozícii. Ak chcete volať, pripojte sa k bezdrôtovej sieti."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ak chcete volať, zadajte platné číslo"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Hovor zlyhal."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Hovor momentálne nie je možné pridať."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Služba nie je podporovaná"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nedajú sa prepínať hovory"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nedá sa rozdeliť hovor"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index be58fe6..e9d3ab7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobilno omrežje ni na voljo. Če želite opraviti klic, vzpostavite povezavo z brezžičnim omrežjem."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Če želite opraviti klic, vnesite veljavno številko."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Klic ni uspel."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Klica trenutno ni mogoče dodati."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Storitev ni podprta"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Preklop med klici ni mogoč."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ločitev klica ni mogoča."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 44d6e87..11e1324 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Rrjeti celular nuk ofrohet. Lidhu me një rrjet pa tel për të bërë një telefonatë."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Për të kryer një telefonatë, fut një numër të vlefshëm."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Thirrja dështoi."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Telefonata nuk mund të shtohet këtë herë."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Shërbimi nuk mbështetet"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nuk mund të ndryshojë telefonatat."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nuk mund të ndajë telefonatën."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c72af8a..dd32d3d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мобилна мрежа није доступна. Повежите се на бежичну да бисте упутили позив."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Да бисте упутили позив, унесите важећи број."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Позив није успео."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Тренутно није могуће додати позив."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Услуга није подржана"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Замена позива није успела."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Раздвајање позива није успело."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e2a5dc5..c3f4f38 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Det finns inga tillgängliga mobilnätverk. Anslut till ett trådlöst nätverk om du vill ringa."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ange ett giltigt nummer om du vill ringa ett samtal."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Det gick inte att koppla samtalet."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Det går inte att lägga till samtalet just nu."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjänsten stöds inte"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Det gick inte att växla mellan samtal."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Det gick inte att koppla isär samtalen."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4fbb333..3833746 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mtandao wa simu za mkononi haupatikani. Unganisha kwenye mtandao pasiwaya ili upige simu."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ili upige simu, weka nambari sahihi."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Imeshindwa kupiga simu."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Hangout haiwezi kuongezwa kwa wakati huu."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Huduma haiwezi kutumika."</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Haiwezi kubadili simu."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Haiwezi kutenganisha simu."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 8c5ec81..d5e6d62 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"மொபைல் நெட்வொர்க் கிடைக்கவில்லை. அழைக்க, வயர்லெஸ் நெட்வொர்க்குடன் இணைக்கவும்."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"அழைக்க, சரியான எண்ணை உள்ளிடவும்."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"அழைப்பு தோல்வியடைந்தது."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"இப்போது அழைப்பைச் சேர்க்க முடியாது."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"சேவை ஆதரிக்கப்படவில்லை"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"அழைப்புகளில் மாற முடியாது."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"அழைப்பைப் பிரிக்க முடியாது."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 4e84caa..6bcae10 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"మొబైల్ నెట్‌వర్క్ అందుబాటులో లేదు. కాల్ చేయడానికి వైర్‌లెస్ నెట్‌వర్క్‌కు కనెక్ట్ చేయండి."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"కాల్ చేయడానికి, చెల్లుబాటు అయ్యే నంబర్‌ను నమోదు చేయండి."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"కాల్ విఫలమైంది."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ఈ సమయంలో కాల్‌ను జోడించడం సాధ్యపడదు."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"సేవకు మద్దతు లేదు"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"కాల్‌లను మార్చలేరు."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"కాల్‌ను వేరు చేయలేరు."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9255ac8..79d7043 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"เครือข่ายมือถือไม่พร้อมใช้งาน โปรดเชื่อมต่อเครือข่ายไร้สายเพื่อโทรออก"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"หากต้องการโทรออก โปรดป้อนหมายเลขที่ถูกต้อง"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"การโทรล้มเหลว"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"ไม่สามารถเพิ่มสายได้ในขณะนี้"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"บริการนี้ไม่ได้รับการสนับสนุน"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ไม่สามารถสลับสายได้"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ไม่สามารถแยกสายได้"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5e61d31..b6f71a8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Hindi available ang mobile network. Kumonekta sa isang wireless network upang tumawag."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Upang tumawag, maglagay ng wastong numero."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Nabigo ang tawag."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Hindi maidaragdag ang tawag sa oras na ito."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Hindi sinusuportahan ang serbisyo"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Hindi mailipat ang mga tawag."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Hindi mapaghiwalay ang tawag"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 101c0cf..94ce394 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobil ağ kullanılamıyor. Telefon etmek için kablosuz ağa bağlanın."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Arama yapmak için geçerli bir numara girin."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Sesli arama başarısız oldu."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Çağrı şu anda eklenemiyor."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Hizmet desteklenmiyor"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Çağrı geçişi yapılamıyor."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Çağrı ayrılamıyor."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b63b724..f62f88b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Мобільна мережа недоступна. Щоб зателефонувати, під’єднайтеся до бездротової мережі."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Щоб зателефонувати, введіть дійсний номер."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Не вдалося здійснити виклик."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Зараз не можна додати виклик."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Служба не підтримується"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Неможливо переключитися між викликами."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Неможливо розділити виклик."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 5857cb1..0a910eb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"موبائل نیٹ ورک دستیاب نہیں ہے۔ کال کرنے کیلئے کسی وائرلیس نیٹ ورک سے منسلک ہوں۔"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"کال کرنے کیلئے، ایک درست نمبر درج کریں۔"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"کال ناکام ہوگئی۔"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"اس وقت کال شامل نہیں ہو سکتی۔"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"سروس تعاون یافتہ نہیں ہے"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"کالز سوئچ نہیں کر سکتے۔"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"کال کو الگ نہیں کر سکتے۔"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 80e7e84..72fbdb9 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Mobil tarmoqdan foydalanib bo‘lmaydi. Qo‘ng‘iroq qilish uchun Wi-Fi tarmog‘iga ulaning."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Chaqiruv amalga oshmadi."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Hozirgi vaqtda qo‘ng‘iroq qo‘shib bo‘lmaydi."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Bu xizmat qo‘llab-quvvatlanmaydi"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Qo‘ng‘iroqlarni almashtirib bo‘lmadi."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Qo‘ng‘iroqni ajratib bo‘lmadi."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f8d2dfa..b48c4cf 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Hiện không có mạng di động. Hãy 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_no_phone_number_supplied" msgid="1150414018684246528">"Để thực hiện cuộc gọi, hãy nhập một số hợp lệ."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Cuộc gọi không thành công."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Không thể thêm cuộc gọi tại thời điểm này."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Dịch vụ không được hỗ trợ"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Không chuyển đổi được cuộc gọi."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Không tách được cuộc gọi."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c0c3ded..923c787 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -464,7 +464,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"移动网络不可用。需连接至无线网络才能拨打电话。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"要拨打电话，请输入有效的电话号码。"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"无法通话。"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"目前无法添加通话。"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"服务不受支持"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"无法切换通话。"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"无法单独通话。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 057636c..b9ee1a3 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"無法使用流動網絡。請連接無線網絡，以撥打電話。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"要撥打電話，請輸入有效的號碼。"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"無法接通。"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"目前無法新增通話。"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"不支援的服務"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分開通話。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fcc5c66..c68a54a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -470,7 +470,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"無法使用行動網路。連上 Wi-Fi 網路即可撥打電話。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"如要撥打電話，請輸入有效的號碼。"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"無法通話。"</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"目前無法新增通話。"</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"不支援的服務"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分割通話。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8107675..b519a97 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -468,7 +468,8 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"Inethiwekhi yeselula ayitholakali. Xhumeka kunethiwekhi engenantambo ukuze wenze ikholi."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ukuze wenze ikholi, faka inombolo evumelekile."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"Ikholi ihlulekile."</string>
-    <string name="incall_error_cannot_add_call" msgid="5206923515522412110">"Ikholi ayikwazi ukungezwa ngalesi sikhathi."</string>
+    <!-- no translation found for incall_error_cannot_add_call (8878159278947023326) -->
+    <skip />
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Isevisi ayisekelwe"</string>
     <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ayikwazi ukushintsha amakholi."</string>
     <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ayikwazi ukuhlukanisa ikholi."</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87e0db5..5eea41a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1037,7 +1037,7 @@
     <!-- In-call screen: call failure message displayed in an error dialog -->
     <string name="incall_error_call_failed">Call failed.</string>
     <!-- In-call screen: call failure message displayed in an error dialog -->
-    <string name="incall_error_cannot_add_call">Call cannot be added at this time.</string>
+    <string name="incall_error_cannot_add_call">Call cannot be added at this time.  You can try to reach out by sending a message.</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_unknown">Service not supported</string>
     <!-- In-call screen: message displayed in an error dialog -->
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 72be17c..5eb28fb 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -42,7 +42,9 @@
 
         <intent android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity"/>
+            android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
+                <extra android:name="show_drawer_menu" android:value="true" />
+        </intent>
 
     </PreferenceScreen>
 
diff --git a/res/xml/network_setting_fragment.xml b/res/xml/network_setting_fragment.xml
index 106d3cb..a4c115d 100644
--- a/res/xml/network_setting_fragment.xml
+++ b/res/xml/network_setting_fragment.xml
@@ -76,7 +76,9 @@
 
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity"/>
+                    android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
+                        <extra android:name="show_drawer_menu" android:value="true" />
+            </intent>
 
         </PreferenceScreen>
 
diff --git a/sip/proguard.flags b/sip/proguard.flags
index 23ae8c1..1c380ed 100644
--- a/sip/proguard.flags
+++ b/sip/proguard.flags
@@ -1,3 +1,3 @@
 -verbose
 -keep class com.android.services.telephony.sip.SipConnectionService
--keep class com.android.services.telephony.sip.SipBroadcastReceiver
+-keep class com.android.services.telephony.sip.SipIncomingCallReceiver
diff --git a/sip/res/values-en-rCA/strings.xml b/sip/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..24693a4
--- /dev/null
+++ b/sip/res/values-en-rCA/strings.xml
@@ -0,0 +1,80 @@
+<?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 settings"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP accounts"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Accounts"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Receive incoming calls"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Uses more battery life"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Use SIP calling"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Use SIP calling (Wi-Fi only)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"For all calls when data network is available"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Only for SIP calls"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"For all calls"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Add account"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Remove account"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP accounts"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Saving the account…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Removing the account…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Save"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Discard"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Close the profile"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Close"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Checking status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registering…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Still trying…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Not receiving calls."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Account registration stopped because there is no Internet connection."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Account registration stopped because there is no Wi-Fi connection."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Account registration unsuccessful."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Receiving calls."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Account registration unsuccessful: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); will try later"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Account registration unsuccessful: Incorrect username or password."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Account registration unsuccessful: Check the server name."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"This account is currently in use by the <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> app."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP account details"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP account details"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Username"</string>
+    <string name="password_title" msgid="5289013731515564295">"Password"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Display name"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Outbound proxy address"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port number"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transport type"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Send keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Optional settings"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Authentication username"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Username used for authentication"</string>
+    <string name="default_preference_summary_username" msgid="8404717434312826082">"&lt;Not set&gt;"</string>
+    <string name="default_preference_summary_password" msgid="4464464672997027904">"&lt;Not set&gt;"</string>
+    <string name="default_preference_summary_domain_address" msgid="4871971710197441673">"&lt;Not set&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Same as username&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Optional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Touch to show all"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Touch to hide all"</string>
+    <string name="all_empty_alert" msgid="4087734950375192387">"Enter details of new SIP account."</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> is required and can\'t be left blank."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Port number should be within 1000 and 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"To place a SIP call, check your Internet connection first."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"You need to be connected to a Wi-Fi network for SIP calls (use the Wireless &amp; Network settings)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP calling not supported"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatic"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Always send"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Built-in SIP calling"</string>
+</resources>
diff --git a/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java b/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java
index 2987ef4..ec77ff1 100644
--- a/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java
+++ b/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java
@@ -111,7 +111,10 @@
         return INSTANCE;
     }
 
-    void setup(Context context) {
+    /**
+     * Sets up the Account registry and performs any upgrade operations before it is used.
+     */
+    public void setup(Context context) {
         verifyAndPurgeInvalidPhoneAccounts(context);
         startSipProfilesAsync(context, (String) null, false);
     }
@@ -157,7 +160,7 @@
      *
      * @param sipProfileName Name of the SIP profile.
      */
-    void removeSipProfile(String sipProfileName) {
+    public void removeSipProfile(String sipProfileName) {
         AccountEntry accountEntry = getAccountEntry(sipProfileName);
 
         if (accountEntry != null) {
diff --git a/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java b/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
similarity index 69%
rename from sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
rename to sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
index 66ae2da..c754ae4 100644
--- a/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
+++ b/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
@@ -27,14 +27,11 @@
 import android.telecom.TelecomManager;
 import android.util.Log;
 
-import com.android.phone.PhoneGlobals;
-import com.android.server.sip.SipService;
-
 /**
- * Broadcast receiver that handles SIP-related intents.
+ * Broadcast receiver that handles explicit incoming call intents
  */
-public class SipBroadcastReceiver extends BroadcastReceiver {
-    private static final String PREFIX = "[SipBroadcastReceiver] ";
+public class SipIncomingCallReceiver extends BroadcastReceiver {
+    private static final String PREFIX = "[SipIncomingCallReceiver] ";
     private static final boolean VERBOSE = false; /* STOP SHIP if true */
 
     @Override
@@ -42,7 +39,7 @@
         String action = intent.getAction();
 
         if (!isRunningInSystemUser()) {
-            if (VERBOSE) log("SipBroadcastReceiver only run in system user, ignore " + action);
+            if (VERBOSE) log("SipIncomingCallReceiver only run in system user, ignore " + action);
             return;
         }
 
@@ -51,18 +48,8 @@
             return;
         }
 
-        SipAccountRegistry sipAccountRegistry = SipAccountRegistry.getInstance();
-        if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
-            SipUtil.startSipService();
-        } else if (action.equals(SipManager.ACTION_SIP_INCOMING_CALL)) {
+        if (action.equals(SipManager.ACTION_SIP_INCOMING_CALL)) {
             takeCall(context, intent);
-        } else if (action.equals(SipManager.ACTION_SIP_SERVICE_UP) ||
-                action.equals(SipManager.ACTION_SIP_CALL_OPTION_CHANGED)) {
-            sipAccountRegistry.setup(context);
-        } else if (action.equals(SipManager.ACTION_SIP_REMOVE_PHONE)) {
-            if (VERBOSE) log("SIP_REMOVE_PHONE " +
-                            intent.getStringExtra(SipManager.EXTRA_LOCAL_URI));
-            sipAccountRegistry.removeSipProfile(intent.getStringExtra(SipManager.EXTRA_LOCAL_URI));
         } else {
             if (VERBOSE) log("onReceive, action not processed: " + action);
         }
@@ -82,7 +69,7 @@
             extras.putParcelable(SipUtil.EXTRA_INCOMING_CALL_INTENT, intent);
             TelecomManager tm = TelecomManager.from(context);
             PhoneAccount phoneAccount = tm.getPhoneAccount(accountHandle);
-            if(phoneAccount != null && phoneAccount.isEnabled()) {
+            if (phoneAccount != null && phoneAccount.isEnabled()) {
                 tm.addNewIncomingCall(accountHandle, extras);
             } else {
                 log("takeCall, PhoneAccount is disabled. Not accepting incoming call...");
diff --git a/sip/src/com/android/services/telephony/sip/SipUtil.java b/sip/src/com/android/services/telephony/sip/SipUtil.java
index a804e3d..d674225 100644
--- a/sip/src/com/android/services/telephony/sip/SipUtil.java
+++ b/sip/src/com/android/services/telephony/sip/SipUtil.java
@@ -60,7 +60,7 @@
 
     static PendingIntent createIncomingCallPendingIntent(
             Context context, String sipProfileName) {
-        Intent intent = new Intent(context, SipBroadcastReceiver.class);
+        Intent intent = new Intent(context, SipIncomingCallReceiver.class);
         intent.setAction(SipManager.ACTION_SIP_INCOMING_CALL);
         intent.putExtra(EXTRA_PHONE_ACCOUNT, SipUtil.createAccountHandle(context, sipProfileName));
         return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
diff --git a/src/com/android/phone/DataUsagePreference.java b/src/com/android/phone/DataUsagePreference.java
index 174ff6a..85e7700 100644
--- a/src/com/android/phone/DataUsagePreference.java
+++ b/src/com/android/phone/DataUsagePreference.java
@@ -20,13 +20,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.NetworkTemplate;
-import android.os.Bundle;
 import android.preference.Preference;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
 
+import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.net.DataUsageController;
 
 /**
@@ -62,8 +62,8 @@
 
     @Override
     public Intent getIntent() {
-        Bundle args = new Bundle();
         Intent intent = new Intent(Settings.ACTION_MOBILE_DATA_USAGE);
+        intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
 
         intent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mTemplate);
         intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);
diff --git a/src/com/android/phone/MobileDataPreference.java b/src/com/android/phone/MobileDataPreference.java
index e1d0528..fe70028 100644
--- a/src/com/android/phone/MobileDataPreference.java
+++ b/src/com/android/phone/MobileDataPreference.java
@@ -114,6 +114,9 @@
 
     @Override
     public void performClick(PreferenceScreen preferenceScreen) {
+        if (!isEnabled() || !SubscriptionManager.isValidSubscriptionId(mSubId)) {
+            return;
+        }
         final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
                 mSubId);
         final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index b490961..0290546 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -256,9 +256,18 @@
             @Override
             public void onCallStateChanged(int state, String incomingNumber) {
                 if (DBG) log("PhoneStateListener.onCallStateChanged: state=" + state);
-                boolean enabled = (state == TelephonyManager.CALL_STATE_IDLE) &&
-                        ImsManager.isNonTtyOrTtyOnVolteEnabled
-                                (getActivity().getApplicationContext());
+
+                Activity activity = getActivity();
+                if (activity == null) {
+                    return;
+                }
+
+                int subId = mPhone != null
+                        ? mPhone.getSubId() : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+                PersistableBundle carrierConfig =
+                        PhoneGlobals.getInstance().getCarrierConfigForSubId(subId);
+                boolean enabled = is4gLtePrefEnabled(activity.getApplicationContext(),
+                        carrierConfig);
                 Preference pref = getPreferenceScreen().findPreference(BUTTON_4G_LTE_KEY);
                 if (pref != null) pref.setEnabled(enabled && hasActiveSubscriptions());
 
@@ -652,8 +661,6 @@
             int max = mSubscriptionManager.getActiveSubscriptionInfoCountMax();
             mActiveSubInfos = new ArrayList<SubscriptionInfo>(max);
 
-            setAndvancedButtonSummary();
-
             IntentFilter intentFilter = new IntentFilter(
                     TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
             activity.registerReceiver(mPhoneChangeReceiver, intentFilter);
@@ -1016,12 +1023,8 @@
              * but you do need to remember that this all needs to work when subscriptions
              * change dynamically such as when hot swapping sims.
              */
-            boolean canChange4glte =
-                    (mTelephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE)
-                            && ImsManager.isNonTtyOrTtyOnVolteEnabled(
-                                    activity.getApplicationContext())
-                            && carrierConfig.getBoolean(
-                            CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
+            boolean canChange4glte = is4gLtePrefEnabled(activity.getApplicationContext(),
+                    carrierConfig);
             boolean useVariant4glteTitle = carrierConfig.getBoolean(
                     CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL);
             int enhanced4glteModeTitleId = useVariant4glteTitle ?
@@ -1227,6 +1230,13 @@
             return true;
         }
 
+        private boolean is4gLtePrefEnabled(Context context, PersistableBundle carrierConfig) {
+            return (mTelephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE)
+                    && ImsManager.isNonTtyOrTtyOnVolteEnabled(context)
+                    && carrierConfig.getBoolean(
+                            CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
+        }
+
         private class MyHandler extends Handler {
 
             static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 0;
@@ -1766,26 +1776,6 @@
             // TODO: add Metrics constants for other preferences and send events here accordingly.
         }
 
-        private void setAndvancedButtonSummary() {
-            if (mAdvancedOptions == null) {
-                return;
-            }
-
-            StringBuilder summary = new StringBuilder();
-            summary.append(mButton4glte.getTitle());
-            summary.append(", ");
-            summary.append(mButtonPreferredNetworkMode.getTitle());
-            summary.append(", ");
-            summary.append(mButtonEnabledNetworks.getTitle());
-            summary.append(", ");
-            summary.append(mEuiccSettingsPref.getTitle());
-            summary.append(", ");
-            summary.append(mWiFiCallingPref.getTitle());
-            summary.append(", ");
-            summary.append(mVideoCallingPref.getTitle());
-            mAdvancedOptions.setSummary(summary.toString());
-        }
-
         private void updateGsmUmtsOptions(PreferenceFragment prefFragment,
                 PreferenceScreen prefScreen, final int subId, INetworkQueryService queryService) {
             // We don't want to re-create GsmUmtsOptions if already exists. Otherwise, the
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 20eedeb..98b94cc 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -65,7 +65,7 @@
 import com.android.phone.common.CallLogAsync;
 import com.android.phone.settings.SettingsConstants;
 import com.android.phone.vvm.CarrierVvmPackageInstalledReceiver;
-import com.android.services.telephony.sip.SipBroadcastReceiver;
+import com.android.services.telephony.sip.SipAccountRegistry;
 import com.android.services.telephony.sip.SipUtil;
 
 import java.io.FileDescriptor;
@@ -176,7 +176,7 @@
     // Broadcast receiver for various intent broadcasts (see onCreate())
     private final BroadcastReceiver mReceiver = new PhoneAppBroadcastReceiver();
     // Broadcast receiver for SIP based intents (see onCreate())
-    private final SipBroadcastReceiver mSipBroadcastReceiver = new SipBroadcastReceiver();
+    private final SipReceiver mSipReceiver = new SipReceiver();
 
     private final CarrierVvmPackageInstalledReceiver mCarrierVvmPackageInstalledReceiver =
             new CarrierVvmPackageInstalledReceiver();
@@ -247,7 +247,7 @@
                 case EVENT_RESTART_SIP:
                     // This should only run if the Phone process crashed and was restarted. We do
                     // not want this running if the device is still in the FBE encrypted state.
-                    // This is the same procedure that is triggered in the SipBroadcastReceiver
+                    // This is the same procedure that is triggered in the SipIncomingCallReceiver
                     // upon BOOT_COMPLETED.
                     UserManager userManager = UserManager.get(sMe);
                     if (userManager != null && userManager.isUserUnlocked()) {
@@ -367,11 +367,10 @@
             registerReceiver(mReceiver, intentFilter);
 
             IntentFilter sipIntentFilter = new IntentFilter(Intent.ACTION_BOOT_COMPLETED);
-            sipIntentFilter.addAction(SipManager.ACTION_SIP_INCOMING_CALL);
             sipIntentFilter.addAction(SipManager.ACTION_SIP_SERVICE_UP);
             sipIntentFilter.addAction(SipManager.ACTION_SIP_CALL_OPTION_CHANGED);
             sipIntentFilter.addAction(SipManager.ACTION_SIP_REMOVE_PHONE);
-            registerReceiver(mSipBroadcastReceiver, sipIntentFilter);
+            registerReceiver(mSipReceiver, sipIntentFilter);
 
             mCarrierVvmPackageInstalledReceiver.register(this);
 
@@ -763,6 +762,31 @@
         }
     }
 
+    private class SipReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+
+            SipAccountRegistry sipAccountRegistry = SipAccountRegistry.getInstance();
+            if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
+                SipUtil.startSipService();
+            } else if (action.equals(SipManager.ACTION_SIP_SERVICE_UP)
+                    || action.equals(SipManager.ACTION_SIP_CALL_OPTION_CHANGED)) {
+                sipAccountRegistry.setup(context);
+            } else if (action.equals(SipManager.ACTION_SIP_REMOVE_PHONE)) {
+                if (DBG) {
+                    Log.d(LOG_TAG, "SIP_REMOVE_PHONE "
+                            + intent.getStringExtra(SipManager.EXTRA_LOCAL_URI));
+                }
+                sipAccountRegistry.removeSipProfile(intent.getStringExtra(
+                        SipManager.EXTRA_LOCAL_URI));
+            } else {
+                if (DBG) Log.d(LOG_TAG, "onReceive, action not processed: " + action);
+            }
+        }
+    }
+
     private void handleServiceStateChanged(Intent intent) {
         /**
          * This used to handle updating EriTextWidgetProvider this routine
diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index 381c131..e52ca72 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -30,7 +30,9 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
+import com.android.internal.telephony.GsmCdmaPhone;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
 import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
 import com.android.internal.telephony.imsphone.ImsExternalConnection;
@@ -320,14 +322,16 @@
             if (original instanceof ImsExternalConnection) {
                 return true;
             }
-            // Since we have set the new connection as the original connection, disconnect the old
-            // one, since it is no longer needed.
-            try {
-                original.hangup();
-                Log.i(this, "Hung up original connection: " + original);
-            } catch (CallStateException e) {
-                Log.w(this, "Couldn't hang up original connection: " + original + ", Error: "
-                        + e.getError());
+            // If the connection we're replacing was a GSM or CDMA connection, call upon the call
+            // tracker to perform cleanup of calls.  This ensures that we don't end up with a
+            // call stuck in the call tracker preventing other calls from being placed.
+            if (original.getCall() != null && original.getCall().getPhone() != null &&
+                    original.getCall().getPhone() instanceof GsmCdmaPhone) {
+
+                GsmCdmaPhone phone = (GsmCdmaPhone) original.getCall().getPhone();
+                phone.getCallTracker().cleanupCalls();
+                Log.i(this, "maybeSwapWithUnknownConnection - Invoking call tracker cleanup "
+                        + "for connection: " + original);
             }
             return true;
         }