Update translation strings.

Test: make Change-Id: Ib75f4f25e91067311de244d7f1fb95bc898aec22
author: Eric Erfanian <erfanian@google.com> 2018-07-10 15:43:01 -0700
committer: Eric Erfanian <erfanian@google.com> 2018-07-10 15:43:01 -0700
commit: cfeab7055f1082aded8b52aad7a110ccade313f8 (patch)
tree: 0755157940ee2d8b50960712e788d286c50e7d9b /java/com/android/incallui/contactgrid/res
parent: e0dbd9f9074559d73e93aeacc3ba27f65e820670 (diff)
82 files changed, 2050 insertions, 3526 deletions
diff --git a/java/com/android/incallui/contactgrid/res/values-af/strings.xml b/java/com/android/incallui/contactgrid/res/values-af/strings.xml
index 3ec7b04f7..968152946 100644
--- a/java/com/android/incallui/contactgrid/res/values-af/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-af/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Bel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Bel tans …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Dra tans oor ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan nie koppel nie"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Oproep geweier"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Oproep het uitgetel"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lui af"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Oproep beëindig"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Hou aan"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Oproep vanaf"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Werkoproep vanaf"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkomend via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Verdagte strooiposbeller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Terugbelnommer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Bel via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Bel tans op dieselfde dinesverskaffer %s</string>
+  <string name="incall_calling_on_recent_choice_template">Bel tans op onlangse keuse %s</string>
+  <string name="incall_connecting">Bel tans …</string>
+  <string name="incall_connecting_assited_dialed">Bel tans deur +%1$s (%2$s) te gebruik …</string>
+  <string name="incall_connecting_assited_dialed_component">Gebruik tans +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Dra tans oor ...</string>
+  <string name="incall_video_call_requesting">Diensverskaffervideo-oproep …</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi-diensverskaffervideo-oproep …</string>
+  <string name="incall_video_call_upgrade_request">Skakel oor na diensverskaffervideo …</string>
+  <string name="incall_video_call_request_failed">Kan nie koppel nie</string>
+  <string name="incall_video_call_request_rejected">Oproep geweier</string>
+  <string name="incall_video_call_request_timed_out">Oproep het uitgetel</string>
+  <string name="incall_hanging_up">Lui af</string>
+  <string name="incall_call_ended">Oproep beëindig</string>
+  <string name="incall_remotely_held">Hou aan</string>
+  <string name="contact_grid_incoming_video_call">Diensverskaffervideo-oproep vanaf</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-diensverskaffervideo-oproep vanaf</string>
+  <string name="contact_grid_incoming_voice_call">Oproep vanaf</string>
+  <string name="contact_grid_incoming_work_call">Werkoproep vanaf</string>
+  <string name="contact_grid_incoming_via_template">Inkomend via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Verdagte strooiposbeller</string>
+  <string name="contact_grid_callback_number">Hierdie foon se nommer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-am/strings.xml b/java/com/android/incallui/contactgrid/res/values-am/strings.xml
index f4a8ce2a8..f36087894 100644
--- a/java/com/android/incallui/contactgrid/res/values-am/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-am/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል በመደወል ላይ"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"በመደወል ላይ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"በማስተላለፍ ላይ…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"መገናኘት አልተቻለም"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ጥሪ ውድቅ ተደርጓል"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ጥሪው ጊዜ ፈጅቷል"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"በመዝጋት ላይ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ጥሪ አብቅቷል"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ያዝና ቆይ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ጥሪ ከ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"የሥራ ጥሪ ከ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል የገባ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"የተጠረጠረ አይፈለጌ ደዋይ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"መልሶ መደወያ ቁጥር፦ <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">በ%s በኩል በመደወል ላይ</string>
+  <string name="incall_calling_on_same_carrier_template">በተመሳሳይ አገልግሎት አቅራቢ %s ላይ በመደወል ላይ</string>
+  <string name="incall_calling_on_recent_choice_template">በቅርብ ጊዜ ምርጫ %s ላይ በመደወል ላይ</string>
+  <string name="incall_connecting">በመደወል ላይ…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) በመጠቀም በመደወል ላይ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ን በመጠቀም ላይ…</string>
+  <string name="incall_transferring">በማስተላለፍ ላይ…</string>
+  <string name="incall_video_call_requesting">የአገልግሎት አቅራቢ የቪዲዮ ጥሪ በማድረግ ላይ…</string>
+  <string name="incall_wifi_video_call_requesting">የWi-Fi የአገልግሎት አቅራቢ የቪዲዮ ጥሪ በማድረግ ላይ…</string>
+  <string name="incall_video_call_upgrade_request">ወደ የአገልግሎት አቅራቢ ቪዲዮ በመቀየር ላይ…</string>
+  <string name="incall_video_call_request_failed">መገናኘት አልተቻለም</string>
+  <string name="incall_video_call_request_rejected">ጥሪ ውድቅ ተደርጓል</string>
+  <string name="incall_video_call_request_timed_out">ጥሪው ጊዜ ፈጅቷል</string>
+  <string name="incall_hanging_up">በመዝጋት ላይ</string>
+  <string name="incall_call_ended">ጥሪ አብቅቷል</string>
+  <string name="incall_remotely_held">ያዝና ቆይ</string>
+  <string name="contact_grid_incoming_video_call">የአገልግሎት አቅራቢ የቪዲዮ ጥሪ ከ</string>
+  <string name="contact_grid_incoming_wifi_video_call">የWi-Fi የአገልግሎት አቅራቢ የቪዲዮ ጥሪ ከ</string>
+  <string name="contact_grid_incoming_voice_call">ጥሪ ከ</string>
+  <string name="contact_grid_incoming_work_call">የሥራ ጥሪ ከ</string>
+  <string name="contact_grid_incoming_via_template">በ%s በኩል የገባ</string>
+  <string name="contact_grid_incoming_suspected_spam">የተጠረጠረ አይፈለጌ ደዋይ</string>
+  <string name="contact_grid_callback_number">የዚህ ፎቶ ቁጥር፦ %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
index a66da9cac..3f8ff041c 100644
--- a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"الاتصال عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"جارٍ الاتصال…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"جارٍ النقل..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"تعذَّر الاتصال."</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"تم رفض الاتصال"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"انتهت مهلة الاتصال"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"إنهاء المكالمة"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"تم إنهاء الاتصال"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"معلقة"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"اتصال من"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"مكالمة عمل من"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"واردة عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"اشتباه في متصل غير مرغوب فيه"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"رقم معاودة الاتصال: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">الاتصال عبر %s</string>
+  <string name="incall_calling_on_same_carrier_template">الاتصال على مشغل شبكة الجوال نفسه %s</string>
+  <string name="incall_calling_on_recent_choice_template">الاتصال على الاختيار الأخير %s</string>
+  <string name="incall_connecting">جارٍ الاتصال…</string>
+  <string name="incall_connecting_assited_dialed">الاتصال باستخدام +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">باستخدام +%1$s (%2$s)…</string>
+  <string name="incall_transferring">جارٍ النقل...</string>
+  <string name="incall_video_call_requesting">مكالمة فيديو باستخدام مشغل شبكة الجوّال...</string>
+  <string name="incall_wifi_video_call_requesting">‏مكالمة فيديو باستخدام مشغل شبكة Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">جارٍ التبديل إلى مكالمة فيديو باستخدام مشغل شبكة الجوّال…</string>
+  <string name="incall_video_call_request_failed">تعذَّر الاتصال.</string>
+  <string name="incall_video_call_request_rejected">تم رفض الاتصال</string>
+  <string name="incall_video_call_request_timed_out">انتهت مهلة الاتصال</string>
+  <string name="incall_hanging_up">إنهاء المكالمة</string>
+  <string name="incall_call_ended">تم إنهاء الاتصال</string>
+  <string name="incall_remotely_held">معلقة</string>
+  <string name="contact_grid_incoming_video_call">مكالمة فيديو باستخدام مشغل شبكة الجوّال من</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏مكالمة فيديو باستخدام مشغل شبكة Wi-Fi من</string>
+  <string name="contact_grid_incoming_voice_call">اتصال من</string>
+  <string name="contact_grid_incoming_work_call">مكالمة عمل من</string>
+  <string name="contact_grid_incoming_via_template">واردة عبر %s</string>
+  <string name="contact_grid_incoming_suspected_spam">اشتباه في متصل غير مرغوب فيه</string>
+  <string name="contact_grid_callback_number">رقم الهاتف هذا: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-az/strings.xml b/java/com/android/incallui/contactgrid/res/values-az/strings.xml
index 235843248..7149d54a5 100644
--- a/java/com/android/incallui/contactgrid/res/values-az/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-az/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə zəng edilir"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Zəng edilir..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Köçürülür..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Qoşulmaq olmur"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Zəng rədd edildi"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Zəngin vaxtı bitdi"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Dəstək asılır"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Zəng sona çatdı"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Gözləmədə"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Zəng edən"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"İş zəngi edən"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə gələn"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Şübhəli spam çağrıcısı"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Cavab zəngi nömrəsi: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s vasitəsilə zəng edilir</string>
+  <string name="incall_calling_on_same_carrier_template">Eyni %s operatorunda zəng edilir</string>
+  <string name="incall_calling_on_recent_choice_template">Son seçilmiş %s operatorunda zəng edilir</string>
+  <string name="incall_connecting">Zəng edilir...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) istifadə edərək zəng edin…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s)… istifadə edilir</string>
+  <string name="incall_transferring">Köçürülür...</string>
+  <string name="incall_video_call_requesting">Operator ilə video zəng...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operatoru ilə video zəng…</string>
+  <string name="incall_video_call_upgrade_request">Operatorla video zəngə keçirilir…</string>
+  <string name="incall_video_call_request_failed">Qoşulmaq olmur</string>
+  <string name="incall_video_call_request_rejected">Zəng rədd edildi</string>
+  <string name="incall_video_call_request_timed_out">Zəngin vaxtı bitdi</string>
+  <string name="incall_hanging_up">Dəstək asılır</string>
+  <string name="incall_call_ended">Zəng sona çatdı</string>
+  <string name="incall_remotely_held">Gözləmədə</string>
+  <string name="contact_grid_incoming_video_call">Operator ilə video zəng</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operatoru ilə video zəng</string>
+  <string name="contact_grid_incoming_voice_call">Zəng edən</string>
+  <string name="contact_grid_incoming_work_call">İş zəngi edən</string>
+  <string name="contact_grid_incoming_via_template">%s vasitəsilə gələn</string>
+  <string name="contact_grid_incoming_suspected_spam">Şübhəli spam çağrıcısı</string>
+  <string name="contact_grid_callback_number">Bu telefonun nömrəsi: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
index 2262b7084..539207875 100644
--- a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Pozivamo preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Pozivamo…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenosimo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezivanje nije uspelo"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Poziv je odbijen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Vremensko ograničenje poziva je isteklo"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekidamo vezu"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Poziv je završen"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv od"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv od"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni poziv preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Potencijalno nepoželjan pozivalac"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Broj za povratni poziv: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Pozivamo preko %s</string>
+  <string name="incall_calling_on_same_carrier_template">Poziva se preko istog mobilnog operatera: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Poziva se na osnovu nedavnog izbora preko: %s</string>
+  <string name="incall_connecting">Pozivamo…</string>
+  <string name="incall_connecting_assited_dialed">Poziva se sa +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Koristi se +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenosimo…</string>
+  <string name="incall_video_call_requesting">Upućuje se video poziv preko operatera…</string>
+  <string name="incall_wifi_video_call_requesting">Prebacuje se na Wi-Fi video poziv preko operatera…</string>
+  <string name="incall_video_call_upgrade_request">Prebacuje se na video poziv preko operatera…</string>
+  <string name="incall_video_call_request_failed">Povezivanje nije uspelo</string>
+  <string name="incall_video_call_request_rejected">Poziv je odbijen</string>
+  <string name="incall_video_call_request_timed_out">Vremensko ograničenje poziva je isteklo</string>
+  <string name="incall_hanging_up">Prekidamo vezu</string>
+  <string name="incall_call_ended">Poziv je završen</string>
+  <string name="incall_remotely_held">Na čekanju</string>
+  <string name="contact_grid_incoming_video_call">Video poziv preko operatera od:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi video poziv preko operatera od:</string>
+  <string name="contact_grid_incoming_voice_call">Poziv od</string>
+  <string name="contact_grid_incoming_work_call">Poslovni poziv od</string>
+  <string name="contact_grid_incoming_via_template">Dolazni poziv preko %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Potencijalno nepoželjan pozivalac</string>
+  <string name="contact_grid_callback_number">Broj ovog telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-be/strings.xml b/java/com/android/incallui/contactgrid/res/values-be/strings.xml
index de7cdcb82..db011cbad 100644
--- a/java/com/android/incallui/contactgrid/res/values-be/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-be/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Званкі праз <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Выклік…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Ідзе перадача…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Немагчыма падключыцца"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Выклік адхілены"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Час чакання выкліку скончыўся"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Завяршэнне выкліку"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Выклік скончаны"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На ўтрыманні"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Выклік ад"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Рабочы выклік ад"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Уваходны выклік праз <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Падазрэнне на спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Нумар для зваротнага выкліку: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Званкі праз %s</string>
+  <string name="incall_calling_on_same_carrier_template">Выклік у сетцы таго ж самага аператара %s</string>
+  <string name="incall_calling_on_recent_choice_template">Выклік у сетку выбранага раней аператара %s</string>
+  <string name="incall_connecting">Выклік…</string>
+  <string name="incall_connecting_assited_dialed">Выклік з выкарыстаннем кода +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">З выкарыстаннем +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Ідзе перадача…</string>
+  <string name="incall_video_call_requesting">Відэавыклікі праз аператара…</string>
+  <string name="incall_wifi_video_call_requesting">Відэавыклік праз аператара Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Пераход на відэавыклік праз аператара…</string>
+  <string name="incall_video_call_request_failed">Немагчыма падключыцца</string>
+  <string name="incall_video_call_request_rejected">Выклік адхілены</string>
+  <string name="incall_video_call_request_timed_out">Час чакання выкліку скончыўся</string>
+  <string name="incall_hanging_up">Завяршэнне выкліку</string>
+  <string name="incall_call_ended">Выклік скончаны</string>
+  <string name="incall_remotely_held">На ўтрыманні</string>
+  <string name="contact_grid_incoming_video_call">Відэавыклік праз аператара ад</string>
+  <string name="contact_grid_incoming_wifi_video_call">Відэавыклік праз аператара Wi-Fi ад</string>
+  <string name="contact_grid_incoming_voice_call">Выклік ад</string>
+  <string name="contact_grid_incoming_work_call">Рабочы выклік ад</string>
+  <string name="contact_grid_incoming_via_template">Уваходны выклік праз %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Падазрэнне на спам</string>
+  <string name="contact_grid_callback_number">Нумар гэтага тэлефона: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
index 0bad3362a..9af43ad57 100644
--- a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Извършва се обаждане…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Прехвърля се…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не може да се установи връзка"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Обаждането бе отказано"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Времето за изчакване на обаждането изтече"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Приключване на разговора"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Обаждането завърши"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Задържано"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Обаждане от"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Служебно обаждане от"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Входящо обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Възможен спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Номер за обратно обаждане: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Обаждане чрез %s</string>
+  <string name="incall_calling_on_same_carrier_template">Обаждане със същия оператор %s</string>
+  <string name="incall_calling_on_recent_choice_template">Обаждане със скорошно избрания %s</string>
+  <string name="incall_connecting">Извършва се обаждане…</string>
+  <string name="incall_connecting_assited_dialed">Обаждане чрез използване на +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Посредством +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Прехвърля се…</string>
+  <string name="incall_video_call_requesting">Видеообаждания през оператора…</string>
+  <string name="incall_wifi_video_call_requesting">Видеообаждания през оператора през Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Превключва се към видеообаждане през оператора…</string>
+  <string name="incall_video_call_request_failed">Не може да се установи връзка</string>
+  <string name="incall_video_call_request_rejected">Обаждането бе отказано</string>
+  <string name="incall_video_call_request_timed_out">Времето за изчакване на обаждането изтече</string>
+  <string name="incall_hanging_up">Приключване на разговора</string>
+  <string name="incall_call_ended">Обаждането завърши</string>
+  <string name="incall_remotely_held">Задържано</string>
+  <string name="contact_grid_incoming_video_call">Видеообаждане през оператора от</string>
+  <string name="contact_grid_incoming_wifi_video_call">Видеообаждане през Wi-Fi през оператора от</string>
+  <string name="contact_grid_incoming_voice_call">Обаждане от</string>
+  <string name="contact_grid_incoming_work_call">Служебно обаждане от</string>
+  <string name="contact_grid_incoming_via_template">Входящо обаждане чрез %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Възможен спам</string>
+  <string name="contact_grid_callback_number">Номерът на този телефон: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
index 09a438e99..5a3c09fae 100644
--- a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে কল করা হচ্ছে"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"কল করা হচ্ছে…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"স্থানান্তর করা হচ্ছে…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"সংযোগ করা গেল না"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"কল অস্বীকার করা হয়েছে"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"কলের সময়সীমা শেষ হয়েছে"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"কল নামিয়ে রাখা হচ্ছে"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"কল শেষ হয়েছে"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"হোল্ডে রয়েছে"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"এর থেকে আগত কল"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"এর থেকে আগত কর্মক্ষেত্রের কল"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে আগত কল"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"সন্দেহভাজন স্প্যাম কলার"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"কলব্যাক নম্বর: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s এর মাধ্যমে কল করা হচ্ছে</string>
+  <string name="incall_calling_on_same_carrier_template">একই পরিষেবা প্রদানকারীর নেটওয়ার্কে কল করা হচ্ছে: %s</string>
+  <string name="incall_calling_on_recent_choice_template">সম্প্রতি বেছে নেওয়া নেটওয়ার্কে কল করা হচ্ছে: %s</string>
+  <string name="incall_connecting">কল করা হচ্ছে…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) দিয়ে কল করা হচ্ছে...</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ব্যবহার করা হচ্ছে…</string>
+  <string name="incall_transferring">স্থানান্তর করা হচ্ছে…</string>
+  <string name="incall_video_call_requesting">মোবাইল ডেটা দিয়ে ভিডিও কল করা হচ্ছে…</string>
+  <string name="incall_wifi_video_call_requesting">ওয়াই-ফাই দিয়ে ভিডিও কল করা হচ্ছে…</string>
+  <string name="incall_video_call_upgrade_request">ভয়েস কল থেকে ভিডিও কলে সুইচ করা হচ্ছে…</string>
+  <string name="incall_video_call_request_failed">সংযোগ করা গেল না</string>
+  <string name="incall_video_call_request_rejected">কল অস্বীকার করা হয়েছে</string>
+  <string name="incall_video_call_request_timed_out">কলের সময়সীমা শেষ হয়েছে</string>
+  <string name="incall_hanging_up">কল নামিয়ে রাখা হচ্ছে</string>
+  <string name="incall_call_ended">কল শেষ হয়েছে</string>
+  <string name="incall_remotely_held">হোল্ডে রয়েছে</string>
+  <string name="contact_grid_incoming_video_call">মোবাইল ডেটা দিয়ে এর ভিডিও কল নিন</string>
+  <string name="contact_grid_incoming_wifi_video_call">ওয়াই-ফাই দিয়ে এর ভিডিও কল নিন</string>
+  <string name="contact_grid_incoming_voice_call">এর থেকে আগত কল</string>
+  <string name="contact_grid_incoming_work_call">এর থেকে আগত কর্মক্ষেত্রের কল</string>
+  <string name="contact_grid_incoming_via_template">%s এর মাধ্যমে আগত কল</string>
+  <string name="contact_grid_incoming_suspected_spam">সন্দেহভাজন স্প্যাম কলার</string>
+  <string name="contact_grid_callback_number">এই ফোনের নম্বর: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
index 5d85cd1f2..bcbb80c9c 100644
--- a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Pozivanje putem mreže <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Pozivanje u toku…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenošenje u toku…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezivanje nije moguće"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Poziv je odbijen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Isteklo vrijeme za uspostavljanje poziva"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekid veze"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Poziv je završen"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv od"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv od"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni poziv putem <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Neželjeni pozivalac"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Broj za povratni poziv: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Pozivanje putem mreže %s</string>
+  <string name="incall_calling_on_same_carrier_template">Pozivanje putem trenutno korištenog mobilnog operatera %s</string>
+  <string name="incall_calling_on_recent_choice_template">Pozivanje putem nedavno korištenog mobilnog operatera %s</string>
+  <string name="incall_connecting">Pozivanje u toku…</string>
+  <string name="incall_connecting_assited_dialed">Pozivanje uz korištenje koda +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Koristi se kôd zemlje +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenošenje u toku…</string>
+  <string name="incall_video_call_requesting">Video poziv putem mobilnog operatera…</string>
+  <string name="incall_wifi_video_call_requesting">Video poziv putem WiFi mreže…</string>
+  <string name="incall_video_call_upgrade_request">Prelazak na video poziv putem mobilnog operatera…</string>
+  <string name="incall_video_call_request_failed">Povezivanje nije uspjelo</string>
+  <string name="incall_video_call_request_rejected">Poziv je odbijen</string>
+  <string name="incall_video_call_request_timed_out">Isteklo vrijeme za uspostavljanje poziva</string>
+  <string name="incall_hanging_up">Prekid veze</string>
+  <string name="incall_call_ended">Poziv je završen</string>
+  <string name="incall_remotely_held">Na čekanju</string>
+  <string name="contact_grid_incoming_video_call">Video poziv putem mobilnog operatera od pozivaoca</string>
+  <string name="contact_grid_incoming_wifi_video_call">Video poziv putem WiFi mreže od pozivaoca</string>
+  <string name="contact_grid_incoming_voice_call">Poziv od</string>
+  <string name="contact_grid_incoming_work_call">Poslovni poziv od</string>
+  <string name="contact_grid_incoming_via_template">Dolazni poziv putem %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Neželjeni pozivalac</string>
+  <string name="contact_grid_callback_number">Broj ovog telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
index 11d25e39c..c48a2831d 100644
--- a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"S\'està trucant amb <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"S\'està trucant…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"S\'està transferint…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"No es pot establir la connexió"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"La trucada s\'ha rebutjat"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"La trucada ha esgotat el temps d\'espera"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"S\'està penjant"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"La trucada ha finalitzat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Trucada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Trucada de feina de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Entrant via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Possible trucada brossa"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de devolució de trucada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">S\'està trucant amb %s</string>
+  <string name="incall_calling_on_same_carrier_template">S\'està trucant amb el mateix operador de telefonia mòbil, %s</string>
+  <string name="incall_calling_on_recent_choice_template">S\'està trucant amb un operador de telefonia triat fa poc, %s</string>
+  <string name="incall_connecting">S\'està trucant…</string>
+  <string name="incall_connecting_assited_dialed">Trucada amb +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">S\'està utilitzant +%1$s (%2$s)…</string>
+  <string name="incall_transferring">S\'està transferint…</string>
+  <string name="incall_video_call_requesting">S\'està iniciant una videotrucada amb l\'operador de telefonia mòbil…</string>
+  <string name="incall_wifi_video_call_requesting">S\'està passant a la videotrucada per Wi-Fi amb l\'operador de telefonia mòbil…</string>
+  <string name="incall_video_call_upgrade_request">S\'està passant a la videotrucada amb l\'operador de telefonia mòbil…</string>
+  <string name="incall_video_call_request_failed">No es pot establir la connexió</string>
+  <string name="incall_video_call_request_rejected">La trucada s\'ha rebutjat</string>
+  <string name="incall_video_call_request_timed_out">La trucada ha esgotat el temps d\'espera</string>
+  <string name="incall_hanging_up">S\'està penjant</string>
+  <string name="incall_call_ended">La trucada ha finalitzat</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videotrucada amb l\'operador de telefonia mòbil de:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videotrucada per Wi-Fi amb l\'operador de telefonia mòbil de:</string>
+  <string name="contact_grid_incoming_voice_call">Trucada de</string>
+  <string name="contact_grid_incoming_work_call">Trucada de feina de</string>
+  <string name="contact_grid_incoming_via_template">Entrant via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Possible trucada brossa</string>
+  <string name="contact_grid_callback_number">Número de telèfon d\'aquest dispositiu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
index 4a216290e..f061ba6c8 100644
--- a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Volání přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Volání…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Přepojování…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nelze se připojit"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Hovor byl odmítnut"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Časový limit hovoru vypršel"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Zavěšování"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Hovor byl ukončen"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Podrženo"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Příchozí hovor:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Příchozí pracovní hovor:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Příchozí hovor přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Podezření na spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Číslo pro zpětné volání: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Volání přes poskytovatele %s</string>
+  <string name="incall_calling_on_same_carrier_template">Volání přes stejného operátora %s</string>
+  <string name="incall_calling_on_recent_choice_template">Volání přes nedávno vybraného operátora %s</string>
+  <string name="incall_connecting">Volání…</string>
+  <string name="incall_connecting_assited_dialed">Volání s předvolbou +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Byla použita předvolba +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Přepojování…</string>
+  <string name="incall_video_call_requesting">Videohovor prostřednictvím operátora…</string>
+  <string name="incall_wifi_video_call_requesting">Videohovor přes Wi-Fi prostřednictvím operátora…</string>
+  <string name="incall_video_call_upgrade_request">Přepínání na videohovor prostřednictvím operátora…</string>
+  <string name="incall_video_call_request_failed">Nelze se připojit</string>
+  <string name="incall_video_call_request_rejected">Hovor byl odmítnut</string>
+  <string name="incall_video_call_request_timed_out">Časový limit hovoru vypršel</string>
+  <string name="incall_hanging_up">Zavěšování</string>
+  <string name="incall_call_ended">Hovor byl ukončen</string>
+  <string name="incall_remotely_held">Podrženo</string>
+  <string name="contact_grid_incoming_video_call">Videohovor prostřednictvím operátora od</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videohovor přes Wi-Fi prostřednictvím operátora od</string>
+  <string name="contact_grid_incoming_voice_call">Příchozí hovor:</string>
+  <string name="contact_grid_incoming_work_call">Příchozí pracovní hovor:</string>
+  <string name="contact_grid_incoming_via_template">Příchozí hovor přes poskytovatele %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Podezření na spam</string>
+  <string name="contact_grid_callback_number">Číslo tohoto telefonu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-da/strings.xml b/java/com/android/incallui/contactgrid/res/values-da/strings.xml
index 584ef31a6..d75ae4c80 100644
--- a/java/com/android/incallui/contactgrid/res/values-da/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-da/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overfører…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Der kunne ikke oprettes forbindelse"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Opkaldet blev afvist"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Opkaldet fik timeout"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lægger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Opkaldet er afsluttet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"I venteposition"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Opkald fra"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Arbejdsopkald fra"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Indgående opkald via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Formodet spammer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Tilbagekaldsnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Der ringes via samme mobilselskab: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Der ringes via det seneste valg: %s</string>
+  <string name="incall_connecting">Ringer…</string>
+  <string name="incall_connecting_assited_dialed">Ring +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Der bruges +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Overfører…</string>
+  <string name="incall_video_call_requesting">Videoopkald via mobilselskab…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi-videoopkald via mobilselskab…</string>
+  <string name="incall_video_call_upgrade_request">Der skiftes til videoopkald via mobilselskab…</string>
+  <string name="incall_video_call_request_failed">Der kunne ikke oprettes forbindelse</string>
+  <string name="incall_video_call_request_rejected">Opkaldet blev afvist</string>
+  <string name="incall_video_call_request_timed_out">Opkaldet fik timeout</string>
+  <string name="incall_hanging_up">Lægger på</string>
+  <string name="incall_call_ended">Opkaldet er afsluttet</string>
+  <string name="incall_remotely_held">I venteposition</string>
+  <string name="contact_grid_incoming_video_call">Videoopkald via mobilselskab fra</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-videoopkald via mobilselskab fra</string>
+  <string name="contact_grid_incoming_voice_call">Opkald fra</string>
+  <string name="contact_grid_incoming_work_call">Arbejdsopkald fra</string>
+  <string name="contact_grid_incoming_via_template">Indgående opkald via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Formodet spammer</string>
+  <string name="contact_grid_callback_number">Telefonens nummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-de/strings.xml b/java/com/android/incallui/contactgrid/res/values-de/strings.xml
index 576aca743..c067f12f4 100644
--- a/java/com/android/incallui/contactgrid/res/values-de/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-de/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Anruf wird getätigt…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Übertragung wird durchgeführt…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kein Verbindungsaufbau möglich"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Anruf abgelehnt"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Zeitüberschreitung bei Anruf"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Auflegen"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Anruf beendet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Anruf wird gehalten"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anruf von"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Geschäftlicher Anruf von"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Eingehender Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Möglicher Spamanrufer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Rückrufnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Anruf über %s</string>
+  <string name="incall_calling_on_same_carrier_template">Anruf über den gleichen Anbieter (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Anruf über zuletzt verwendeten Anbieter (%s)</string>
+  <string name="incall_connecting">Anruf wird getätigt…</string>
+  <string name="incall_connecting_assited_dialed">Anruf über +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Verwendete Nummer: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Übertragung wird durchgeführt…</string>
+  <string name="incall_video_call_requesting">Videoanruf über Mobilfunkanbieter…</string>
+  <string name="incall_wifi_video_call_requesting">Videoanruf über WLAN…</string>
+  <string name="incall_video_call_upgrade_request">Zu Video über Mobilfunkanbieter wechseln…</string>
+  <string name="incall_video_call_request_failed">Kein Verbindungsaufbau möglich</string>
+  <string name="incall_video_call_request_rejected">Anruf abgelehnt</string>
+  <string name="incall_video_call_request_timed_out">Zeitüberschreitung bei Anruf</string>
+  <string name="incall_hanging_up">Auflegen</string>
+  <string name="incall_call_ended">Anruf beendet</string>
+  <string name="incall_remotely_held">Anruf wird gehalten</string>
+  <string name="contact_grid_incoming_video_call">Videoanruf über Mobilfunkanbieter von</string>
+  <string name="contact_grid_incoming_wifi_video_call">WLAN-Videoanruf von</string>
+  <string name="contact_grid_incoming_voice_call">Anruf von</string>
+  <string name="contact_grid_incoming_work_call">Geschäftlicher Anruf von</string>
+  <string name="contact_grid_incoming_via_template">Eingehender Anruf über %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Möglicher Spamanrufer</string>
+  <string name="contact_grid_callback_number">Eigene Telefonnummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-el/strings.xml b/java/com/android/incallui/contactgrid/res/values-el/strings.xml
index 24419542d..d0ed5459e 100644
--- a/java/com/android/incallui/contactgrid/res/values-el/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-el/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Κλήση…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Μεταφορά…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Αδυναμία σύνδεσης"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Η κλήση απορρίφθηκε"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Λήξη χρονικού ορίου κλήσης"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Κλείσιμο γραμμής"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Η κλήση τερματίστηκε"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Σε αναμονή"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Κλήση από"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Κλήση από το γραφείο από"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Εισερχόμενη κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Πιθανώς ανεπιθύμητος"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Αριθμός επανάκλησης: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Κλήση μέσω %s</string>
+  <string name="incall_calling_on_same_carrier_template">Κλήση στην ίδια εταιρεία κινητής τηλεφωνίας, %s</string>
+  <string name="incall_calling_on_recent_choice_template">Κλήση στην πρόσφατη επιλογή, %s</string>
+  <string name="incall_connecting">Κλήση…</string>
+  <string name="incall_connecting_assited_dialed">Κλήση με χρήση του +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Χρήση +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Μεταφορά…</string>
+  <string name="incall_video_call_requesting">Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας…</string>
+  <string name="incall_wifi_video_call_requesting">Βιντεοκλήση WiFi μέσω εταιρείας κινητής τηλεφωνίας…</string>
+  <string name="incall_video_call_upgrade_request">Αλλαγή σε βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας…</string>
+  <string name="incall_video_call_request_failed">Αδυναμία σύνδεσης</string>
+  <string name="incall_video_call_request_rejected">Η κλήση απορρίφθηκε</string>
+  <string name="incall_video_call_request_timed_out">Λήξη χρονικού ορίου κλήσης</string>
+  <string name="incall_hanging_up">Κλείσιμο γραμμής</string>
+  <string name="incall_call_ended">Η κλήση τερματίστηκε</string>
+  <string name="incall_remotely_held">Σε αναμονή</string>
+  <string name="contact_grid_incoming_video_call">Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας από</string>
+  <string name="contact_grid_incoming_wifi_video_call">Βιντεοκλήση WiFi μέσω εταιρείας κινητής τηλεφωνίας από</string>
+  <string name="contact_grid_incoming_voice_call">Κλήση από</string>
+  <string name="contact_grid_incoming_work_call">Κλήση από το γραφείο από</string>
+  <string name="contact_grid_incoming_via_template">Εισερχόμενη κλήση μέσω %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Πιθανώς ανεπιθύμητος</string>
+  <string name="contact_grid_callback_number">Ο αριθμός αυτού του τηλεφώνου: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
index 20894ef72..47c2873a2 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Calling…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferring…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Unable to connect"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Call declined"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Call timed out"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Hanging up"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Call ended"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Suspected spam caller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Calling via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Calling on same operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice %s</string>
+  <string name="incall_connecting">Calling…</string>
+  <string name="incall_connecting_assited_dialed">Calling using +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Using +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferring…</string>
+  <string name="incall_video_call_requesting">Operator video calling…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operator video calling…</string>
+  <string name="incall_video_call_upgrade_request">Switching to operator video…</string>
+  <string name="incall_video_call_request_failed">Unable to connect</string>
+  <string name="incall_video_call_request_rejected">Call declined</string>
+  <string name="incall_video_call_request_timed_out">Call timed out</string>
+  <string name="incall_hanging_up">Hanging up</string>
+  <string name="incall_call_ended">Call ended</string>
+  <string name="incall_remotely_held">On hold</string>
+  <string name="contact_grid_incoming_video_call">Operator video call from</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operator video call from</string>
+  <string name="contact_grid_incoming_voice_call">Call from</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">Incoming via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+  <string name="contact_grid_callback_number">This phone\'s number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
index 20894ef72..47c2873a2 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Calling…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferring…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Unable to connect"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Call declined"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Call timed out"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Hanging up"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Call ended"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Suspected spam caller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Calling via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Calling on same operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice %s</string>
+  <string name="incall_connecting">Calling…</string>
+  <string name="incall_connecting_assited_dialed">Calling using +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Using +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferring…</string>
+  <string name="incall_video_call_requesting">Operator video calling…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operator video calling…</string>
+  <string name="incall_video_call_upgrade_request">Switching to operator video…</string>
+  <string name="incall_video_call_request_failed">Unable to connect</string>
+  <string name="incall_video_call_request_rejected">Call declined</string>
+  <string name="incall_video_call_request_timed_out">Call timed out</string>
+  <string name="incall_hanging_up">Hanging up</string>
+  <string name="incall_call_ended">Call ended</string>
+  <string name="incall_remotely_held">On hold</string>
+  <string name="contact_grid_incoming_video_call">Operator video call from</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operator video call from</string>
+  <string name="contact_grid_incoming_voice_call">Call from</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">Incoming via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+  <string name="contact_grid_callback_number">This phone\'s number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
index 20894ef72..47c2873a2 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Calling…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferring…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Unable to connect"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Call declined"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Call timed out"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Hanging up"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Call ended"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Suspected spam caller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Calling via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Calling on same operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice %s</string>
+  <string name="incall_connecting">Calling…</string>
+  <string name="incall_connecting_assited_dialed">Calling using +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Using +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferring…</string>
+  <string name="incall_video_call_requesting">Operator video calling…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operator video calling…</string>
+  <string name="incall_video_call_upgrade_request">Switching to operator video…</string>
+  <string name="incall_video_call_request_failed">Unable to connect</string>
+  <string name="incall_video_call_request_rejected">Call declined</string>
+  <string name="incall_video_call_request_timed_out">Call timed out</string>
+  <string name="incall_hanging_up">Hanging up</string>
+  <string name="incall_call_ended">Call ended</string>
+  <string name="incall_remotely_held">On hold</string>
+  <string name="contact_grid_incoming_video_call">Operator video call from</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operator video call from</string>
+  <string name="contact_grid_incoming_voice_call">Call from</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">Incoming via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+  <string name="contact_grid_callback_number">This phone\'s number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
index af27240af..9492eb86a 100644
--- a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Llamada por medio de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Llamando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfiriendo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"No se pudo conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Llamada rechazada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Se agotó el tiempo de espera de la llamada"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Colgando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Llamada finalizada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Llamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Llamada laboral de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Entrante por medio de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Posible spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de devolución de llamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Llamada por medio de %s</string>
+  <string name="incall_calling_on_same_carrier_template">Llamada mediante el mismo proveedor que el destinatario: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Llamada mediante el proveedor seleccionado recientemente: %s</string>
+  <string name="incall_connecting">Llamando…</string>
+  <string name="incall_connecting_assited_dialed">Para llamar, marcar +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Código de país: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfiriendo…</string>
+  <string name="incall_video_call_requesting">Realizando videollamada mediante el proveedor…</string>
+  <string name="incall_wifi_video_call_requesting">Realizando videollamada mediante el proveedor de Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Cambiando a videollamada mediante el proveedor…</string>
+  <string name="incall_video_call_request_failed">No se pudo conectar</string>
+  <string name="incall_video_call_request_rejected">Llamada rechazada</string>
+  <string name="incall_video_call_request_timed_out">Se agotó el tiempo de espera de la llamada</string>
+  <string name="incall_hanging_up">Colgando</string>
+  <string name="incall_call_ended">Llamada finalizada</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videollamada mediante el proveedor de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videollamada mediante el proveedor de Wi-Fi de</string>
+  <string name="contact_grid_incoming_voice_call">Llamada de</string>
+  <string name="contact_grid_incoming_work_call">Llamada laboral de</string>
+  <string name="contact_grid_incoming_via_template">Entrante por medio de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Posible spam</string>
+  <string name="contact_grid_callback_number">Número de teléfono de este dispositivo: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-es/strings.xml b/java/com/android/incallui/contactgrid/res/values-es/strings.xml
index 37db8a3c7..615bf1b46 100644
--- a/java/com/android/incallui/contactgrid/res/values-es/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-es/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Llamando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfiriéndola…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"No se ha podido establecer conexión"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Se ha rechazado la llamada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"La llamada ha superado el tiempo de espera"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Colgando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Llamada finalizada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Llamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Llamada de trabajo de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Recibida a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Sospechoso de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de devolución de llamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Llamada a través de %s</string>
+  <string name="incall_calling_on_same_carrier_template">Llamando a través del mismo operador: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Llamando a través de un operador elegido hace poco: %s</string>
+  <string name="incall_connecting">Llamando…</string>
+  <string name="incall_connecting_assited_dialed">Llamando con +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Usando +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfiriéndola…</string>
+  <string name="incall_video_call_requesting">Iniciando una videollamada a través del operador…</string>
+  <string name="incall_wifi_video_call_requesting">Iniciando una videollamada por Wi-Fi a través del operador…</string>
+  <string name="incall_video_call_upgrade_request">Cambiando a una videollamada a través del operador…</string>
+  <string name="incall_video_call_request_failed">No se ha podido establecer conexión</string>
+  <string name="incall_video_call_request_rejected">Se ha rechazado la llamada</string>
+  <string name="incall_video_call_request_timed_out">La llamada ha superado el tiempo de espera</string>
+  <string name="incall_hanging_up">Colgando</string>
+  <string name="incall_call_ended">Llamada finalizada</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videollamada a través del operador de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videollamada por Wi-Fi a través del operador de</string>
+  <string name="contact_grid_incoming_voice_call">Llamada de</string>
+  <string name="contact_grid_incoming_work_call">Llamada de trabajo de</string>
+  <string name="contact_grid_incoming_via_template">Recibida a través de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Sospechoso de spam</string>
+  <string name="contact_grid_callback_number">Este número de teléfono: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-et/strings.xml b/java/com/android/incallui/contactgrid/res/values-et/strings.xml
index 5635f9e76..8ef202220 100644
--- a/java/com/android/incallui/contactgrid/res/values-et/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-et/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Kõne edastab <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Helistamine …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Ülekandmine …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Ühendust ei õnnestu luua"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Kõnest keelduti"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Kõne aegus"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lõpetamine"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Kõne lõpetati"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Ootel"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Kõne kontaktilt"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Töökõne kontaktilt"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Sissetulev kõne teenusepakkuja <xliff:g id="PROVIDER_NAME">%s</xliff:g> kaudu"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Arvatav rämpskõnetegija"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Tagasihelistamise number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Kõne edastab %s</string>
+  <string name="incall_calling_on_same_carrier_template">Helistatakse sama operaatori %s võrgus</string>
+  <string name="incall_calling_on_recent_choice_template">Helistatakse hiljuti valitud operaatori %s võrgus</string>
+  <string name="incall_connecting">Helistamine …</string>
+  <string name="incall_connecting_assited_dialed">Helistamine koodiga +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Kasutatakse koodi +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Ülekandmine …</string>
+  <string name="incall_video_call_requesting">Operaatori videokõne …</string>
+  <string name="incall_wifi_video_call_requesting">WiFi-operaatori videokõne …</string>
+  <string name="incall_video_call_upgrade_request">Operaatori videole lülitumine …</string>
+  <string name="incall_video_call_request_failed">Ühendust ei õnnestu luua</string>
+  <string name="incall_video_call_request_rejected">Kõnest keelduti</string>
+  <string name="incall_video_call_request_timed_out">Kõne aegus</string>
+  <string name="incall_hanging_up">Lõpetamine</string>
+  <string name="incall_call_ended">Kõne lõpetati</string>
+  <string name="incall_remotely_held">Ootel</string>
+  <string name="contact_grid_incoming_video_call">Operaatori videokõne kasutajalt</string>
+  <string name="contact_grid_incoming_wifi_video_call">WiFi-operaatori videokõne kasutajalt</string>
+  <string name="contact_grid_incoming_voice_call">Kõne kontaktilt</string>
+  <string name="contact_grid_incoming_work_call">Töökõne kontaktilt</string>
+  <string name="contact_grid_incoming_via_template">Sissetulev kõne teenusepakkuja %s kaudu</string>
+  <string name="contact_grid_incoming_suspected_spam">Arvatav rämpskõnetegija</string>
+  <string name="contact_grid_callback_number">Selle telefoni number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
index 3478d8424..1692a568b 100644
--- a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> bidez deitzen"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Deitzen…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferitzen…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Ezin da konektatu"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Deia baztertu da"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Denbora-muga gainditu du deiak"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Deia amaitzen"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Amaitu da deia"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Zain"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Deia:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Laneko deia:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> bidez jasotzen"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Ustezko spam-deitzailea"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Dei-erantzunetarako zenbakia: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s bidez deitzen</string>
+  <string name="incall_calling_on_same_carrier_template">Operadore berberarekin (%s) deitzen</string>
+  <string name="incall_calling_on_recent_choice_template">Duela gutxi aukeratutako operadorearekin (%s) deitzen</string>
+  <string name="incall_connecting">Deitzen…</string>
+  <string name="incall_connecting_assited_dialed">Deitzeko, erabili +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) erabiltzen…</string>
+  <string name="incall_transferring">Transferitzen…</string>
+  <string name="incall_video_call_requesting">Operadorearen bideo-deia egiten…</string>
+  <string name="incall_wifi_video_call_requesting">Operadorearen bideo-deia egiten Wi-Fi konexioa erabilita…</string>
+  <string name="incall_video_call_upgrade_request">Operadorearen bideo-deia modura aldatzen…</string>
+  <string name="incall_video_call_request_failed">Ezin da konektatu</string>
+  <string name="incall_video_call_request_rejected">Deia baztertu da</string>
+  <string name="incall_video_call_request_timed_out">Denbora-muga gainditu du deiak</string>
+  <string name="incall_hanging_up">Deia amaitzen</string>
+  <string name="incall_call_ended">Amaitu da deia</string>
+  <string name="incall_remotely_held">Zain</string>
+  <string name="contact_grid_incoming_video_call">Operadorearen bideo-deia:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Operadorearen Wi-Fi bidezko bideo-deia:</string>
+  <string name="contact_grid_incoming_voice_call">Deia:</string>
+  <string name="contact_grid_incoming_work_call">Laneko deia:</string>
+  <string name="contact_grid_incoming_via_template">%s bidez jasotzen</string>
+  <string name="contact_grid_incoming_suspected_spam">Ustezko spam-deitzailea</string>
+  <string name="contact_grid_callback_number">Telefono-zenbaki hau: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
index 453a3d2db..6814e789c 100644
--- a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"تماس از طریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"در حال تماس…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"در حال انتقال..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"اتصال برقرار نشد"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"تماس پذیرفته نشد"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"مدت زمان تماس تمام شد"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"قطع تماس"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"تماس پایان یافت"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"درانتظار"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"تماس از"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"تماس کاری از"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"تماس‌های ورودی ازطریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"تماس‌گیرنده هرزنامه احتمالی"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"شماره پاسخ تماس: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">تماس از طریق %s</string>
+  <string name="incall_calling_on_same_carrier_template">تماس ازطریق شرکت مخابراتی %s یکسان</string>
+  <string name="incall_calling_on_recent_choice_template">تماس ازطریق انتخاب اخیر %s</string>
+  <string name="incall_connecting">در حال تماس…</string>
+  <string name="incall_connecting_assited_dialed">برقراری تماس با استفاده از %1$s+ (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">درحال استفاده از +%1$s (%2$s)…</string>
+  <string name="incall_transferring">در حال انتقال...</string>
+  <string name="incall_video_call_requesting">تماس ویدیویی شرکت مخابراتی…</string>
+  <string name="incall_wifi_video_call_requesting">‏تماس ویدیویی Wi-Fi شرکت مخابراتی…</string>
+  <string name="incall_video_call_upgrade_request">درحال تغییر وضعیت به ویدیوی شرکت مخابراتی…</string>
+  <string name="incall_video_call_request_failed">اتصال برقرار نشد</string>
+  <string name="incall_video_call_request_rejected">تماس پذیرفته نشد</string>
+  <string name="incall_video_call_request_timed_out">مدت زمان تماس تمام شد</string>
+  <string name="incall_hanging_up">قطع تماس</string>
+  <string name="incall_call_ended">تماس پایان یافت</string>
+  <string name="incall_remotely_held">درانتظار</string>
+  <string name="contact_grid_incoming_video_call">تماس ویدیویی شرکت مخابراتی از</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏تماس ویدیویی Wi-Fi شرکت مخابراتی از</string>
+  <string name="contact_grid_incoming_voice_call">تماس از</string>
+  <string name="contact_grid_incoming_work_call">تماس کاری از</string>
+  <string name="contact_grid_incoming_via_template">تماس‌های ورودی ازطریق %s</string>
+  <string name="contact_grid_incoming_suspected_spam">تماس‌گیرنده هرزنامه احتمالی</string>
+  <string name="contact_grid_callback_number">شماره این تلفن: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
index 12bc2d79a..f12a58c53 100644
--- a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Käytetään operaattoria <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Soitetaan…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Siirretään…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Yhteyden muodostaminen epäonnistui"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Puhelu hylätty"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Puhelu aikakatkaistiin"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Katkaistaan"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Puhelu päättyi"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Pidossa"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Puhelu henkilöltä"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Työpuhelu henkilöltä"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Saapuva puhelu (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Mahdollinen häirikkösoittaja"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Takaisinsoittonumero: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Käytetään operaattoria %s</string>
+  <string name="incall_calling_on_same_carrier_template">Soitetaan samalla operaattorilla %s</string>
+  <string name="incall_calling_on_recent_choice_template">Soitetaan viimeksi valitulla operaattorilla %s</string>
+  <string name="incall_connecting">Soitetaan…</string>
+  <string name="incall_connecting_assited_dialed">Soitetaan numeroon +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Käytössä +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Siirretään…</string>
+  <string name="incall_video_call_requesting">Soitetaan videopuhelua…</string>
+  <string name="incall_wifi_video_call_requesting">Soitetaan Wi-Fi-videopuhelua…</string>
+  <string name="incall_video_call_upgrade_request">Vaihdetaan videopuheluun…</string>
+  <string name="incall_video_call_request_failed">Yhteyden muodostaminen epäonnistui</string>
+  <string name="incall_video_call_request_rejected">Puhelu hylätty</string>
+  <string name="incall_video_call_request_timed_out">Puhelu aikakatkaistiin</string>
+  <string name="incall_hanging_up">Katkaistaan</string>
+  <string name="incall_call_ended">Puhelu päättyi</string>
+  <string name="incall_remotely_held">Pidossa</string>
+  <string name="contact_grid_incoming_video_call">Videopuhelu käyttäjältä</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-videopuhelu käyttäjältä</string>
+  <string name="contact_grid_incoming_voice_call">Puhelu henkilöltä</string>
+  <string name="contact_grid_incoming_work_call">Työpuhelu henkilöltä</string>
+  <string name="contact_grid_incoming_via_template">Saapuva puhelu (%s)</string>
+  <string name="contact_grid_incoming_suspected_spam">Mahdollinen häirikkösoittaja</string>
+  <string name="contact_grid_callback_number">Tämän puhelimen numero: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
index ddbd75a85..17b2bc0bd 100644
--- a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Appel par <xliff:g id="PROVIDER_NAME">%s</xliff:g> en cours…"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Appel en cours…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfert en cours…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Échec de la connexion"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Appel refusé"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Délai de connexion de l\'appel dépassé"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Fin de l\'appel"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Appel terminé"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En attente"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Appel de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Appel professionnel de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Appel entrant par <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Appel suspect"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numéro de rappel : <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Appel par %s en cours…</string>
+  <string name="incall_calling_on_same_carrier_template">Appel avec le même fournisseur de services (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Appel avec le fournisseur de services habituel (%s)</string>
+  <string name="incall_connecting">Appel en cours…</string>
+  <string name="incall_connecting_assited_dialed">Appel utilisant +%1$s (%2$s) en cours…</string>
+  <string name="incall_connecting_assited_dialed_component">Utilisation du préfixe +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfert en cours…</string>
+  <string name="incall_video_call_requesting">Appel vidéo par l\'entremise du fournisseur de services…</string>
+  <string name="incall_wifi_video_call_requesting">Appel vidéo Wi-Fi par l\'entremise du fournisseur de services…</string>
+  <string name="incall_video_call_upgrade_request">Conversion en appel vidéo par l\'entremise du fournisseur de services…</string>
+  <string name="incall_video_call_request_failed">Échec de la connexion</string>
+  <string name="incall_video_call_request_rejected">Appel refusé</string>
+  <string name="incall_video_call_request_timed_out">Délai de connexion de l\'appel dépassé</string>
+  <string name="incall_hanging_up">Fin de l\'appel</string>
+  <string name="incall_call_ended">Appel terminé</string>
+  <string name="incall_remotely_held">En attente</string>
+  <string name="contact_grid_incoming_video_call">Appel vidéo (par l\'entremise du fournisseur de services) de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Appel vidéo Wi-Fi (par l\'entremise du fournisseur de services) de</string>
+  <string name="contact_grid_incoming_voice_call">Appel de</string>
+  <string name="contact_grid_incoming_work_call">Appel professionnel de</string>
+  <string name="contact_grid_incoming_via_template">Appel entrant par %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Appel suspect</string>
+  <string name="contact_grid_callback_number">Numéro de ce téléphone : %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
index c527f19db..da7c68e35 100644
--- a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Appel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Appel en cours"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfert…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Impossible de se connecter"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Appel refusé"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Le délai d\'établissement de la communication a expiré."</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Fin de l\'appel..."</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Appel terminé"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En attente"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Appel de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Appel professionnel de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Appel entrant via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Appel indésirable suspecté"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numéro de rappel : <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Appel via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Appel avec le même opérateur (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Appel avec l\'opérateur habituel (%s)</string>
+  <string name="incall_connecting">Appel en cours</string>
+  <string name="incall_connecting_assited_dialed">Appel en cours avec l\'indicatif +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Utilisation du préfixe +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfert…</string>
+  <string name="incall_video_call_requesting">Appels vidéo via l\'opérateur…</string>
+  <string name="incall_wifi_video_call_requesting">Appel vidéo Wi-Fi via l\'opérateur…</string>
+  <string name="incall_video_call_upgrade_request">Conversion de l\'appel audio en appel vidéo…</string>
+  <string name="incall_video_call_request_failed">Impossible de se connecter</string>
+  <string name="incall_video_call_request_rejected">Appel refusé</string>
+  <string name="incall_video_call_request_timed_out">Le délai d\'établissement de la communication a expiré.</string>
+  <string name="incall_hanging_up">Fin de l\'appel...</string>
+  <string name="incall_call_ended">Appel terminé</string>
+  <string name="incall_remotely_held">En attente</string>
+  <string name="contact_grid_incoming_video_call">Appel vidéo (via l\'opérateur) de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Appel vidéo Wi-Fi (via l\'opérateur) de</string>
+  <string name="contact_grid_incoming_voice_call">Appel de</string>
+  <string name="contact_grid_incoming_work_call">Appel professionnel de</string>
+  <string name="contact_grid_incoming_via_template">Appel entrant via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Appel indésirable suspecté</string>
+  <string name="contact_grid_callback_number">Numéro de ce téléphone : %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
index 9633ca81a..a139f4ae8 100644
--- a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Chamando a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chamando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferindo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Non se pode conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Rexeitouse a chamada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"A chamada superou o tempo de espera"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Desconectando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Finalizouse a chamada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de traballo de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada entrante a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Chamada sospeitosa de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número para devolver a chamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Chamando a través de %s</string>
+  <string name="incall_calling_on_same_carrier_template">Chamada a través do mesmo operador (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Chamada a través dun operador seleccionado habitualmente (%s)</string>
+  <string name="incall_connecting">Chamando…</string>
+  <string name="incall_connecting_assited_dialed">Chamada usando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Prefixo utilizado: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferindo…</string>
+  <string name="incall_video_call_requesting">Videochamadas a través do operador…</string>
+  <string name="incall_wifi_video_call_requesting">Videochamadas por wifi a través do operador…</string>
+  <string name="incall_video_call_upgrade_request">Cambiando a videochamada a través do operador…</string>
+  <string name="incall_video_call_request_failed">Non se pode conectar</string>
+  <string name="incall_video_call_request_rejected">Rexeitouse a chamada</string>
+  <string name="incall_video_call_request_timed_out">A chamada superou o tempo de espera</string>
+  <string name="incall_hanging_up">Desconectando</string>
+  <string name="incall_call_ended">Finalizouse a chamada</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada a través do operador de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada por wifi a través do operador de</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de traballo de</string>
+  <string name="contact_grid_incoming_via_template">Chamada entrante a través de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Chamada sospeitosa de spam</string>
+  <string name="contact_grid_callback_number">Número deste teléfono: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
index 61c3cba1c..b0c51b601 100644
--- a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> મારફતે કૉલ કરી રહ્યાં છે"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"કૉલ કરી રહ્યાં છે…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"સ્થાનાંતરિત કરી રહ્યું છે…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"કનેક્ટ કરવામાં અસમર્થ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"કૉલ નકારાયો"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"કૉલનો સમય પૂરો થયો"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"સમાપ્ત કરી રહ્યાં છે"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"કૉલ સમાપ્ત થયો"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"હોલ્ડ પર"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"આમના તરફથી કૉલ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"આમના તરફથી કાર્ય કૉલ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> મારફતે ઇનકમિંગ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"શંકાસ્પદ સ્પામ કૉલર"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"કૉલબેક નંબર: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s મારફતે કૉલ કરી રહ્યાં છે</string>
+  <string name="incall_calling_on_same_carrier_template">સમાન કૅરિઅર %s પરથી કૉલ કરી રહ્યાં છીએ</string>
+  <string name="incall_calling_on_recent_choice_template">તાજેતરની પસંદગી %s પરથી કૉલ કરી રહ્યાં છીએ</string>
+  <string name="incall_connecting">કૉલ કરી રહ્યાં છે…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s)નો ઉપયોગ કરીને કૉલ કરી રહ્યાં છીએ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s)નો ઉપયોગ કરી રહ્યાં છીએ…</string>
+  <string name="incall_transferring">સ્થાનાંતરિત કરી રહ્યું છે…</string>
+  <string name="incall_video_call_requesting">કૅરિઅર મારફતે વીડિઓ કૉલ કરી રહ્યાં છીએ…</string>
+  <string name="incall_wifi_video_call_requesting">વાઇ-ફાઇ કૅરિઅર મારફતે વીડિઓ કૉલ કરી રહ્યાં છીએ…</string>
+  <string name="incall_video_call_upgrade_request">કૅરિઅર વીડિઓ પર સ્વિચ કરી રહ્યાં છીએ…</string>
+  <string name="incall_video_call_request_failed">કનેક્ટ કરવામાં અસમર્થ</string>
+  <string name="incall_video_call_request_rejected">કૉલ નકારાયો</string>
+  <string name="incall_video_call_request_timed_out">કૉલનો સમય પૂરો થયો</string>
+  <string name="incall_hanging_up">સમાપ્ત કરી રહ્યાં છે</string>
+  <string name="incall_call_ended">કૉલ સમાપ્ત થયો</string>
+  <string name="incall_remotely_held">હોલ્ડ પર</string>
+  <string name="contact_grid_incoming_video_call">આમના તરફથી કૅરિઅર મારફતે વીડિઓ કૉલ</string>
+  <string name="contact_grid_incoming_wifi_video_call">આમના તરફથી વાઇ-ફાઇ કૅરિઅર મારફતે વીડિઓ કૉલ</string>
+  <string name="contact_grid_incoming_voice_call">આમના તરફથી કૉલ</string>
+  <string name="contact_grid_incoming_work_call">આમના તરફથી કાર્ય કૉલ</string>
+  <string name="contact_grid_incoming_via_template">%s મારફતે ઇનકમિંગ</string>
+  <string name="contact_grid_incoming_suspected_spam">શંકાસ્પદ સ્પામ કૉલર</string>
+  <string name="contact_grid_callback_number">આ ફોનનો નંબર: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
index f7be7801a..103b40f69 100644
--- a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> के माध्यम से कॉल किया जा रहा है"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"कॉल किया जा रहा है..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"स्थानांतरित हो रहा है…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"कनेक्ट करने में असमर्थ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"कॉल अस्‍वीकृत"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"कॉल का समय समाप्‍त"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"कॉल समाप्त हो रहा है"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"कॉल समाप्त"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"होल्ड पर"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"इससे कॉल"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"इससे कार्य संबंधी कॉल"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> की ओर से इनकमिंग"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"संदिग्ध स्पैम कॉलर"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"कॉलबैक नंबर: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s के माध्यम से कॉल किया जा रहा है</string>
+  <string name="incall_calling_on_same_carrier_template">एक ही वाहक %s के ज़रिए कॉल किया जा रहा है</string>
+  <string name="incall_calling_on_recent_choice_template">हाल ही में चुने गए वाहक %s के ज़रिए कॉल किया जा रहा है</string>
+  <string name="incall_connecting">कॉल किया जा रहा है...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) का उपयोग करके कॉल कर रहा है…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) का उपयोग किया जा रहा है…</string>
+  <string name="incall_transferring">ट्रांसफ़र किया जा रहा है…</string>
+  <string name="incall_video_call_requesting">वाहक वीडियो कॉलिंग…</string>
+  <string name="incall_wifi_video_call_requesting">वाई-फ़ाई वाहक वीडियो कॉलिंग…</string>
+  <string name="incall_video_call_upgrade_request">वाहक वीडियो पर स्विच हो रहा है …</string>
+  <string name="incall_video_call_request_failed">कनेक्ट करने में असमर्थ</string>
+  <string name="incall_video_call_request_rejected">कॉल अस्‍वीकृत</string>
+  <string name="incall_video_call_request_timed_out">कॉल का समय समाप्‍त</string>
+  <string name="incall_hanging_up">कॉल समाप्त हो रहा है</string>
+  <string name="incall_call_ended">कॉल समाप्त</string>
+  <string name="incall_remotely_held">होल्ड पर</string>
+  <string name="contact_grid_incoming_video_call">इस व्यक्ति की ओर से वाहक वीडियो कॉल</string>
+  <string name="contact_grid_incoming_wifi_video_call">इस व्यक्ति की ओर से वाई-फ़ाई वाहक वीडियो कॉल</string>
+  <string name="contact_grid_incoming_voice_call">इससे कॉल</string>
+  <string name="contact_grid_incoming_work_call">इससे कार्य संबंधी कॉल</string>
+  <string name="contact_grid_incoming_via_template">%s की ओर से इनकमिंग</string>
+  <string name="contact_grid_incoming_suspected_spam">संदिग्ध स्पैम कॉलर</string>
+  <string name="contact_grid_callback_number">इस फ़ोन का नंबर: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
index a38f644db..1bad571e8 100644
--- a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Pozivanje putem operatera <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Pozivanje…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenošenje..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezivanje nije moguće"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Poziv je odbijen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Poziv je istekao"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekidanje veze"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Poziv je završio"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv s broja"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv s broja"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni pozivi putem davatelja <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Mogući neželjeni pozivatelj"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Broj za povratni poziv: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Pozivanje putem operatera %s</string>
+  <string name="incall_calling_on_same_carrier_template">Pozivanje putem istog operatera %s</string>
+  <string name="incall_calling_on_recent_choice_template">Pozivanje prema posljednjem odabiru operatera %s</string>
+  <string name="incall_connecting">Pozivanje…</string>
+  <string name="incall_connecting_assited_dialed">Pozivanje broja +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Upotrebljava se +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenošenje...</string>
+  <string name="incall_video_call_requesting">Uspostavljanje videopoziva putem mobilnog operatera...</string>
+  <string name="incall_wifi_video_call_requesting">Uspostavljanje Wi-Fi videpoziva putem mobilnog operatera…</string>
+  <string name="incall_video_call_upgrade_request">Prebacivanje na videopoziv putem mobilnog operatera…</string>
+  <string name="incall_video_call_request_failed">Povezivanje nije moguće</string>
+  <string name="incall_video_call_request_rejected">Poziv je odbijen</string>
+  <string name="incall_video_call_request_timed_out">Poziv je istekao</string>
+  <string name="incall_hanging_up">Prekidanje veze</string>
+  <string name="incall_call_ended">Poziv je završio</string>
+  <string name="incall_remotely_held">Na čekanju</string>
+  <string name="contact_grid_incoming_video_call">Videopoziv putem mobilnog operatera od</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi videopoziv putem mobilnog operatera od</string>
+  <string name="contact_grid_incoming_voice_call">Poziv s broja</string>
+  <string name="contact_grid_incoming_work_call">Poslovni poziv s broja</string>
+  <string name="contact_grid_incoming_via_template">Dolazni pozivi putem davatelja %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Mogući neželjeni pozivatelj</string>
+  <string name="contact_grid_callback_number">Broj ovog telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
index 978a11d63..39a9deecc 100644
--- a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Hívás a(z) <xliff:g id="PROVIDER_NAME">%s</xliff:g> szolgáltatón keresztül"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Hívás…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Átirányítás…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nem sikerült kapcsolódni"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Hívás elutasítva"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"A hívás túllépte az időkorlátot"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Megszakítás"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"A hívás befejeződött"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Várakoztatva"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Hívás a következőtől:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Munkahelyi hívás a következőről:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Bejövő hívás a következőn keresztül: <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Feltételezett spamhívó"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Visszahívható telefonszám: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Hívás a(z) %s szolgáltatón keresztül</string>
+  <string name="incall_calling_on_same_carrier_template">Hívás ugyanazon a szolgáltatón (%s) keresztül</string>
+  <string name="incall_calling_on_recent_choice_template">Hívás a legutóbb használt szolgáltatón (%s) keresztül</string>
+  <string name="incall_connecting">Hívás…</string>
+  <string name="incall_connecting_assited_dialed">Hívás a következővel: +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">A következő használata: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Átirányítás…</string>
+  <string name="incall_video_call_requesting">Szolgáltatói videohívás…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi-alapú szolgáltatói videohívás…</string>
+  <string name="incall_video_call_upgrade_request">Váltás szolgáltatói videohívásra…</string>
+  <string name="incall_video_call_request_failed">Nem sikerült kapcsolódni</string>
+  <string name="incall_video_call_request_rejected">Hívás elutasítva</string>
+  <string name="incall_video_call_request_timed_out">A hívás túllépte az időkorlátot</string>
+  <string name="incall_hanging_up">Megszakítás</string>
+  <string name="incall_call_ended">A hívás befejeződött</string>
+  <string name="incall_remotely_held">Várakoztatva</string>
+  <string name="contact_grid_incoming_video_call">Szolgáltatói videohívás tőle</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-alapú szolgáltatói videohívás tőle</string>
+  <string name="contact_grid_incoming_voice_call">Hívás a következőtől:</string>
+  <string name="contact_grid_incoming_work_call">Munkahelyi hívás a következőről:</string>
+  <string name="contact_grid_incoming_via_template">Bejövő hívás a következőn keresztül: %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Feltételezett spamhívó</string>
+  <string name="contact_grid_callback_number">A telefon száma: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
index 0ed82dcea..92ec0a560 100644
--- a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Զանգում է <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ի միջոցով"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Զանգ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Փոխանցում…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Չհաջողվեց միանալ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Զանգը մերժվեց"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Զանգի սպասման ժամանակը սպառվեց"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Անջատում"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Զանգն ավարտվեց"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Սպասում"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Զանգ հետևյալ բաժանորդից՝"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Գործնական զանգ հետևյալ բաժանորդից՝"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Մուտքային զանգ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ցանցից"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Հավանաբար լցոն է"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Հետադարձ զանգի համարը՝ <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Զանգում է %s-ի միջոցով</string>
+  <string name="incall_calling_on_same_carrier_template">Զանգը կատարվում է միևնույն օպերատորի (%s) ցանցում</string>
+  <string name="incall_calling_on_recent_choice_template">Զանգը կատարվում է վերջին ընտրված օպերատորի (%s) ցանցում</string>
+  <string name="incall_connecting">Զանգ…</string>
+  <string name="incall_connecting_assited_dialed">Զանգ +%1$s կոդով (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Օգտագործվում է +%1$s (%2$s) ձևաչափը…</string>
+  <string name="incall_transferring">Փոխանցում…</string>
+  <string name="incall_video_call_requesting">Տեսազանգ բջջային ցանցով…</string>
+  <string name="incall_wifi_video_call_requesting">Տեսազանգ Wi-Fi-ով…</string>
+  <string name="incall_video_call_upgrade_request">Անցում տեսազանգի (բջջային ցանցով)…</string>
+  <string name="incall_video_call_request_failed">Չհաջողվեց միանալ</string>
+  <string name="incall_video_call_request_rejected">Զանգը մերժվեց</string>
+  <string name="incall_video_call_request_timed_out">Զանգի սպասման ժամանակը սպառվեց</string>
+  <string name="incall_hanging_up">Անջատում</string>
+  <string name="incall_call_ended">Զանգն ավարտվեց</string>
+  <string name="incall_remotely_held">Սպասում</string>
+  <string name="contact_grid_incoming_video_call">Տեսազանգ հետևյալ բաժանորդից (բջջային ցանցով)՝</string>
+  <string name="contact_grid_incoming_wifi_video_call">Տեսազանգ հետևյալ բաժանորդից (Wi-Fi-ով)՝</string>
+  <string name="contact_grid_incoming_voice_call">Զանգ հետևյալ բաժանորդից՝</string>
+  <string name="contact_grid_incoming_work_call">Գործնական զանգ հետևյալ բաժանորդից՝</string>
+  <string name="contact_grid_incoming_via_template">Մուտքային զանգ %s ցանցից</string>
+  <string name="contact_grid_incoming_suspected_spam">Հավանաբար սպամ է</string>
+  <string name="contact_grid_callback_number">Այս հեռախոսի համարը՝ %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-in/strings.xml b/java/com/android/incallui/contactgrid/res/values-in/strings.xml
index afba5cccb..e93c58085 100644
--- a/java/com/android/incallui/contactgrid/res/values-in/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-in/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Menelepon melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Menelepon…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Mentransfer…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Tidak dapat tersambung"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Panggilan telepon ditolak"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Batas waktu panggilan telepon habis"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Menutup panggilan"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Panggilan telepon diakhiri"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Ditangguhkan"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Telepon dari"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Panggilan telepon kerja dari"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Masuk melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Diduga telepon spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nomor panggilan balik: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Menelepon melalui %s</string>
+  <string name="incall_calling_on_same_carrier_template">Menelepon pada operator yang sama %s</string>
+  <string name="incall_calling_on_recent_choice_template">Menelepon pada provider pilihan terbaru %s</string>
+  <string name="incall_connecting">Menelepon…</string>
+  <string name="incall_connecting_assited_dialed">Menelepon nomor +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Menggunakan +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Mentransfer…</string>
+  <string name="incall_video_call_requesting">Video call operator…</string>
+  <string name="incall_wifi_video_call_requesting">Video call operator Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Beralih ke video operator…</string>
+  <string name="incall_video_call_request_failed">Tidak dapat tersambung</string>
+  <string name="incall_video_call_request_rejected">Panggilan telepon ditolak</string>
+  <string name="incall_video_call_request_timed_out">Batas waktu panggilan telepon habis</string>
+  <string name="incall_hanging_up">Menutup panggilan</string>
+  <string name="incall_call_ended">Panggilan telepon diakhiri</string>
+  <string name="incall_remotely_held">Ditangguhkan</string>
+  <string name="contact_grid_incoming_video_call">Video call operator dari</string>
+  <string name="contact_grid_incoming_wifi_video_call">Video call operator Wi-Fi dari</string>
+  <string name="contact_grid_incoming_voice_call">Telepon dari</string>
+  <string name="contact_grid_incoming_work_call">Panggilan telepon kerja dari</string>
+  <string name="contact_grid_incoming_via_template">Masuk melalui %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Diduga telepon spam</string>
+  <string name="contact_grid_callback_number">Nomor telepon: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-is/strings.xml b/java/com/android/incallui/contactgrid/res/values-is/strings.xml
index d01f0968c..8be33bbbe 100644
--- a/java/com/android/incallui/contactgrid/res/values-is/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-is/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Hringt í gegnum <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Hringir…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Flytur…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Tenging tókst ekki"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Símtali hafnað"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Símtalstími rann út"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Leggur á"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Lagt á"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Í bið"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Símtal berst frá"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Vinnusímtal berst frá"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Berst í gegnum <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Mögulegt ruslnúmer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Svarhringingarnúmer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Hringt í gegnum %s</string>
+  <string name="incall_calling_on_same_carrier_template">Hringir með sama símafyrirtæki, %s</string>
+  <string name="incall_calling_on_recent_choice_template">Hringir með nýlegu vali, %s</string>
+  <string name="incall_connecting">Hringir…</string>
+  <string name="incall_connecting_assited_dialed">Hringir með +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Notar +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Flytur…</string>
+  <string name="incall_video_call_requesting">Myndsímtal um símkerfi…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi myndsímtal…</string>
+  <string name="incall_video_call_upgrade_request">Skiptir yfir í myndsímtal um símkerfi…</string>
+  <string name="incall_video_call_request_failed">Tenging tókst ekki</string>
+  <string name="incall_video_call_request_rejected">Símtali hafnað</string>
+  <string name="incall_video_call_request_timed_out">Símtalstími rann út</string>
+  <string name="incall_hanging_up">Leggur á</string>
+  <string name="incall_call_ended">Lagt á</string>
+  <string name="incall_remotely_held">Í bið</string>
+  <string name="contact_grid_incoming_video_call">Myndsímtal um símkerfi frá</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi myndsímtal frá</string>
+  <string name="contact_grid_incoming_voice_call">Símtal berst frá</string>
+  <string name="contact_grid_incoming_work_call">Vinnusímtal berst frá</string>
+  <string name="contact_grid_incoming_via_template">Berst í gegnum %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Mögulegt ruslnúmer</string>
+  <string name="contact_grid_callback_number">Símanúmer þessa síma: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-it/strings.xml b/java/com/android/incallui/contactgrid/res/values-it/strings.xml
index 9d39a81a3..9147c13e8 100644
--- a/java/com/android/incallui/contactgrid/res/values-it/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-it/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Chiamate tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chiamata…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Trasferimento…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Impossibile collegarsi"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chiamata rifiutata"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Timeout della chiamata"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"In fase di chiusura"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chiamata terminata"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"In attesa"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chiamata da"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chiamata di lavoro da"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"In arrivo tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Presunto spammer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numero da richiamare: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Chiamate tramite %s</string>
+  <string name="incall_calling_on_same_carrier_template">Chiamata tramite lo stesso operatore %s</string>
+  <string name="incall_calling_on_recent_choice_template">Chiamata tramite una scelta recente %s</string>
+  <string name="incall_connecting">Chiamata…</string>
+  <string name="incall_connecting_assited_dialed">Chiamata utilizzando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Uso di +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Trasferimento…</string>
+  <string name="incall_video_call_requesting">Videochiamata dell\'operatore…</string>
+  <string name="incall_wifi_video_call_requesting">Videochiamata Wi-Fi dell\'operatore…</string>
+  <string name="incall_video_call_upgrade_request">Passaggio al video dell\'operatore…</string>
+  <string name="incall_video_call_request_failed">Impossibile collegarsi</string>
+  <string name="incall_video_call_request_rejected">Chiamata rifiutata</string>
+  <string name="incall_video_call_request_timed_out">Timeout della chiamata</string>
+  <string name="incall_hanging_up">In fase di chiusura</string>
+  <string name="incall_call_ended">Chiamata terminata</string>
+  <string name="incall_remotely_held">In attesa</string>
+  <string name="contact_grid_incoming_video_call">Videochiamata dell\'operatore da</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochiamata Wi-Fi dell\'operatore da</string>
+  <string name="contact_grid_incoming_voice_call">Chiamata da</string>
+  <string name="contact_grid_incoming_work_call">Chiamata di lavoro da</string>
+  <string name="contact_grid_incoming_via_template">In arrivo tramite %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Presunto spammer</string>
+  <string name="contact_grid_callback_number">Il numero di questo telefono: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
index 10c3ebfba..3495ddbfc 100644
--- a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"שיחה באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"מתקשר…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"מעביר…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"לא ניתן להתחבר"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"השיחה נדחתה"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"הזמן שהוקצב לשיחה תם"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"מנתק"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"השיחה הסתיימה"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"בהמתנה"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"שיחה מאת"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"שיחת עבודה מאת"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"שיחה נכנסת באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"חשד לשיחת ספאם"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"מספר להתקשרות בחזרה: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">שיחה באמצעות %s</string>
+  <string name="incall_calling_on_same_carrier_template">התקשרות באמצעות אותו ספק סלולרי, %s</string>
+  <string name="incall_calling_on_recent_choice_template">התקשרות באמצעות האפשרות האחרונה שנבחרה, %s</string>
+  <string name="incall_connecting">מתקשר…</string>
+  <string name="incall_connecting_assited_dialed">התקשרות עם הקידומת %1$s+ (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">המערכת משתמשת בקידומת %1$s+ (%2$s)…</string>
+  <string name="incall_transferring">מעביר…</string>
+  <string name="incall_video_call_requesting">מיד נתחיל שיחת וידאו דרך הספק הסלולרי…</string>
+  <string name="incall_wifi_video_call_requesting">‏מיד נתחיל שיחת וידאו דרך רשת Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">אנחנו עוברים לווידאו דרך הספק הסלולרי…</string>
+  <string name="incall_video_call_request_failed">לא ניתן להתחבר</string>
+  <string name="incall_video_call_request_rejected">השיחה נדחתה</string>
+  <string name="incall_video_call_request_timed_out">הזמן שהוקצב לשיחה תם</string>
+  <string name="incall_hanging_up">מנתק</string>
+  <string name="incall_call_ended">השיחה הסתיימה</string>
+  <string name="incall_remotely_held">בהמתנה</string>
+  <string name="contact_grid_incoming_video_call">שיחת וידאו דרך הספק הסלולרי מאת</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏שיחת וידאו דרך רשת Wi-Fi מאת</string>
+  <string name="contact_grid_incoming_voice_call">שיחה מאת</string>
+  <string name="contact_grid_incoming_work_call">שיחת עבודה מאת</string>
+  <string name="contact_grid_incoming_via_template">שיחה נכנסת באמצעות %s</string>
+  <string name="contact_grid_incoming_suspected_spam">חשד לשיחת ספאם</string>
+  <string name="contact_grid_callback_number">מספר הטלפון הזה: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
index f44b1c95e..bdafab1b8 100644
--- a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> で発信中"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"発信中…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"転送中…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"接続できません"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通話が拒否されました"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通話がタイムアウトしました"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"通話を終了中"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通話終了"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保留中"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"着信"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"仕事の通話の着信"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> から着信"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"迷惑電話の疑いあり"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"折り返し番号: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s で発信中</string>
+  <string name="incall_calling_on_same_carrier_template">同じ携帯通信会社（%s）で発信中</string>
+  <string name="incall_calling_on_recent_choice_template">最近選択した携帯通信会社（%s）で発信中</string>
+  <string name="incall_connecting">発信中…</string>
+  <string name="incall_connecting_assited_dialed">電話番号に +%1$s（%2$s）を付けて発信しています…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s（%2$s）を使用しています…</string>
+  <string name="incall_transferring">転送中…</string>
+  <string name="incall_video_call_requesting">携帯通信会社経由でビデオ通話を発信しています…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi 経由でビデオ通話を発信しています…</string>
+  <string name="incall_video_call_upgrade_request">携帯通信会社経由のビデオ通話に切り替えています…</string>
+  <string name="incall_video_call_request_failed">接続できません</string>
+  <string name="incall_video_call_request_rejected">通話が拒否されました</string>
+  <string name="incall_video_call_request_timed_out">通話がタイムアウトしました</string>
+  <string name="incall_hanging_up">通話を終了中</string>
+  <string name="incall_call_ended">通話終了</string>
+  <string name="incall_remotely_held">保留中</string>
+  <string name="contact_grid_incoming_video_call">携帯通信会社経由でビデオ通話を着信中</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi 経由でビデオ通話を着信中</string>
+  <string name="contact_grid_incoming_voice_call">着信</string>
+  <string name="contact_grid_incoming_work_call">仕事の通話の着信</string>
+  <string name="contact_grid_incoming_via_template">%s から着信</string>
+  <string name="contact_grid_incoming_suspected_spam">迷惑電話の疑いあり</string>
+  <string name="contact_grid_callback_number">この電話番号: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
index f799561f5..fdc22321b 100644
--- a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"მიმდინარეობს დარეკვა <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ის მეშვეობით"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"დარეკვა…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"გადაცემა…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"დაკავშირება შეუძლებელია"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ზარი უარყოფილია"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ზარის დრო ამოიწურა"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"მიმდინარეობს გათიშვა"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ზარი დასრულდა"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"მოცდის რეჟიმში"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ზარი აბონენტისგან"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"სამსახურებრივი ზარი აბონენტისგან"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"შემომავალი, <xliff:g id="PROVIDER_NAME">%s</xliff:g>-იდან"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"სავარაუდოდ სპამერი აბონენტი"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ნომერი გადმორეკვისთვის: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">მიმდინარეობს დარეკვა %s-ის მეშვეობით</string>
+  <string name="incall_calling_on_same_carrier_template">მიმდინარეობს დარეკვა იმავე ოპერატორზე: %s</string>
+  <string name="incall_calling_on_recent_choice_template">მიმდინარეობს დარეკვა ბოლოს არჩეულზე: %s</string>
+  <string name="incall_connecting">დარეკვა…</string>
+  <string name="incall_connecting_assited_dialed">ირეკება +%1$s-ის (%2$s) გამოყენებით…</string>
+  <string name="incall_connecting_assited_dialed_component">იყენებთ: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">გადაცემა…</string>
+  <string name="incall_video_call_requesting">ვიდეო დარეკვა ოპერატორით…</string>
+  <string name="incall_wifi_video_call_requesting">მიმდინარეობს ვიდეო დარეკვა Wi-Fi ოპერატორით…</string>
+  <string name="incall_video_call_upgrade_request">მიმდინარეობს ოპერატორით ვიდეო დარეკვაზე გადართვა…</string>
+  <string name="incall_video_call_request_failed">დაკავშირება შეუძლებელია</string>
+  <string name="incall_video_call_request_rejected">ზარი უარყოფილია</string>
+  <string name="incall_video_call_request_timed_out">ზარის დრო ამოიწურა</string>
+  <string name="incall_hanging_up">მიმდინარეობს გათიშვა</string>
+  <string name="incall_call_ended">ზარი დასრულდა</string>
+  <string name="incall_remotely_held">მოცდის რეჟიმში</string>
+  <string name="contact_grid_incoming_video_call">ვიდეოზარი ოპერატორით ნომრიდან</string>
+  <string name="contact_grid_incoming_wifi_video_call">ვიდეოზარი Wi-Fi ოპერატორით ნომრიდან</string>
+  <string name="contact_grid_incoming_voice_call">ზარი აბონენტისგან</string>
+  <string name="contact_grid_incoming_work_call">სამსახურებრივი ზარი აბონენტისგან</string>
+  <string name="contact_grid_incoming_via_template">შემომავალი, %s-იდან</string>
+  <string name="contact_grid_incoming_suspected_spam">სავარაუდოდ სპამერი აბონენტი</string>
+  <string name="contact_grid_callback_number">ამ ტელეფონის ნომერი: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
index d80b915a0..e0d6e63f4 100644
--- a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы қоңырау шалу"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Қоңырау шалуда…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Тасымалдануда..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Қосылу мүмкін емес"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Қоңырау қабылданбады"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Қоңырау уақыты бітті"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Қоңырау аяқталуда"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Қоңырау аяқталды"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Күтуде"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Қоңырау шалушы:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Жұмыстан қоңырау шалушы:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы кіріс"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Спам қоңырау шалушы болуы мүмкін"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Кері қоңырау шалу нөмірі: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s арқылы қоңырау шалу</string>
+  <string name="incall_calling_on_same_carrier_template">Қоңырау шалушы қолданған %s операторы қолданылуда</string>
+  <string name="incall_calling_on_recent_choice_template">Бірнеше рет таңдалған %s операторы қолданылуда</string>
+  <string name="incall_connecting">Қоңырау шалуда…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) кодымен қоңырау шалу…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) пайдаланылуда…</string>
+  <string name="incall_transferring">Тасымалдануда...</string>
+  <string name="incall_video_call_requesting">Оператор бейне қоңырауы...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi бейне қоңырауы…</string>
+  <string name="incall_video_call_upgrade_request">Оператор бейне қоңырауына ауысуда…</string>
+  <string name="incall_video_call_request_failed">Қосылу мүмкін емес</string>
+  <string name="incall_video_call_request_rejected">Қоңырау қабылданбады</string>
+  <string name="incall_video_call_request_timed_out">Қоңырау уақыты бітті</string>
+  <string name="incall_hanging_up">Қоңырау аяқталуда</string>
+  <string name="incall_call_ended">Қоңырау аяқталды</string>
+  <string name="incall_remotely_held">Күтуде</string>
+  <string name="contact_grid_incoming_video_call">Оператор бейне қоңырауы:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi бейне қоңырауы:</string>
+  <string name="contact_grid_incoming_voice_call">Қоңырау шалушы:</string>
+  <string name="contact_grid_incoming_work_call">Жұмыстан қоңырау шалушы:</string>
+  <string name="contact_grid_incoming_via_template">%s арқылы кіріс</string>
+  <string name="contact_grid_incoming_suspected_spam">Спам қоңырау шалушы болуы мүмкін</string>
+  <string name="contact_grid_callback_number">Телефон нөмірі: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-km/strings.xml b/java/com/android/incallui/contactgrid/res/values-km/strings.xml
index f19eb7249..c75146ee9 100644
--- a/java/com/android/incallui/contactgrid/res/values-km/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-km/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"កំពុងហៅតាម <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"កំពុងហៅ..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"កំពុងផ្ទេរ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"មិនអាចភ្ជាប់បាន"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"បានបដិសេធការហៅ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ការហៅបានអស់ពេល"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"បញ្ចប់ការសន្ទនា"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"បានបញ្ចប់ការហៅ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"កំពុងរង់ចាំ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ការហៅពី"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ការហៅការងារពី"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"ការហៅចូលតាម <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"អ្នកហៅបន្លំដែលសង្ស័យ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"លេខហៅត្រឡប់វិញ៖ <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">កំពុងហៅតាម %s</string>
+  <string name="incall_calling_on_same_carrier_template">កំពុងហៅទូរសព្ទតាមក្រុមហ៊ុនសេវាទូរសព្ទ %s ដូចគ្នា</string>
+  <string name="incall_calling_on_recent_choice_template">កំពុងហៅទូរសព្ទលើជម្រើស %s ថ្មីៗ</string>
+  <string name="incall_connecting">កំពុងហៅ...</string>
+  <string name="incall_connecting_assited_dialed">កំពុងហៅទូរសព្ទ ដោយប្រើប្រាស់ +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">កំពុងប្រើប្រាស់ +%1$s (%2$s)…</string>
+  <string name="incall_transferring">កំពុងផ្ទេរ...</string>
+  <string name="incall_video_call_requesting">កំពុងហៅជាវីដេអូតាមក្រុមហ៊ុនបម្រើសេវាទូរសព្ទ...</string>
+  <string name="incall_wifi_video_call_requesting">កំពុងហៅជាវីដេអូតាមក្រុមហ៊ុនបម្រើសេវាទូរសព្ទតាម Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">កំពុងប្ដូរទៅការហៅជាវីដេអូតាមក្រុមហ៊ុនបម្រើសេវាទូរសព្ទ…</string>
+  <string name="incall_video_call_request_failed">មិនអាចភ្ជាប់បាន</string>
+  <string name="incall_video_call_request_rejected">បានបដិសេធការហៅ</string>
+  <string name="incall_video_call_request_timed_out">ការហៅបានអស់ពេល</string>
+  <string name="incall_hanging_up">បញ្ចប់ការសន្ទនា</string>
+  <string name="incall_call_ended">បានបញ្ចប់ការហៅ</string>
+  <string name="incall_remotely_held">កំពុងរង់ចាំ</string>
+  <string name="contact_grid_incoming_video_call">ការហៅជាវីដេអូលើក្រុមហ៊ុនបម្រើសេវាទូរសព្ទពី</string>
+  <string name="contact_grid_incoming_wifi_video_call">ការហៅជាវីដេអូតាមក្រុមហ៊ុនបម្រើសេវាទូរសព្ទតាម Wi-Fi ពី</string>
+  <string name="contact_grid_incoming_voice_call">ការហៅពី</string>
+  <string name="contact_grid_incoming_work_call">ការហៅការងារពី</string>
+  <string name="contact_grid_incoming_via_template">ការហៅចូលតាម %s</string>
+  <string name="contact_grid_incoming_suspected_spam">អ្នកហៅបន្លំដែលសង្ស័យ</string>
+  <string name="contact_grid_callback_number">លេខទូរសព្ទនេះ៖ %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
index 927b54ab2..33e21edcd 100644
--- a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ಕರೆ ನಿರಾಕರಿಸಲಾಗಿದೆ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ಕರೆ ಅವಧಿ ಮೀರಿದೆ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ಹ್ಯಾಂಗ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ಕರೆ ಅಂತ್ಯಗೊಂಡಿದೆ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ಹೋಲ್ಡ್‌ ಮಾಡಲಾಗಿದೆ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ಇವರಿಂದ ಕರೆ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ಇವರಿಂದ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರು"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ಮರಳಿಕರೆ ಮಾಡುವ ಸಂಖ್ಯೆ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_calling_on_same_carrier_template">%s ವಾಹಕದ ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_calling_on_recent_choice_template">ಇತ್ತೀಚಿನ ಆಯ್ಕೆಯ ಆಧಾರದ ಮೇಲೆ %s ನಿಂದ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_connecting">ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) ಬಳಸಿಕೊಂಡು ಕರೆಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="incall_transferring">ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ...</string>
+  <string name="incall_video_call_requesting">ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ…</string>
+  <string name="incall_wifi_video_call_requesting">ವೈ-ಫೈ ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ…</string>
+  <string name="incall_video_call_upgrade_request">ವಾಹಕ ವೀಡಿಯೊಗೆ ಬದಲಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="incall_video_call_request_failed">ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+  <string name="incall_video_call_request_rejected">ಕರೆ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
+  <string name="incall_video_call_request_timed_out">ಕರೆ ಅವಧಿ ಮೀರಿದೆ</string>
+  <string name="incall_hanging_up">ಹ್ಯಾಂಗ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_call_ended">ಕರೆ ಅಂತ್ಯಗೊಂಡಿದೆ</string>
+  <string name="incall_remotely_held">ಹೋಲ್ಡ್‌ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="contact_grid_incoming_video_call">ಇವರಿಂದ ವಾಹಕ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ಇವರಿಂದ ವೈ-ಫೈ ವಾಹಕ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="contact_grid_incoming_voice_call">ಇವರಿಂದ ಕರೆ</string>
+  <string name="contact_grid_incoming_work_call">ಇವರಿಂದ ಕೆಲಸದ ಕರೆ</string>
+  <string name="contact_grid_incoming_via_template">%s ಮೂಲಕ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="contact_grid_incoming_suspected_spam">ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರು</string>
+  <string name="contact_grid_callback_number">ಈ ಫೋನ್‌ನ ಸಂಖ್ಯೆ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
index 0717c0b75..83f964a70 100644
--- a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 거는 전화"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"전화 거는 중…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"전환 중…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"연결할 수 없습니다."</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"통화가 거부되었습니다."</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"통화 시간이 초과되었습니다."</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"전화 끊는 중"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"통화 종료됨"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"대기 중"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"통화 발신:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"업무 통화 발신:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 걸려온 전화"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"스팸으로 의심되는 발신자"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"회신번호: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s을(를) 통해 거는 전화</string>
+  <string name="incall_calling_on_same_carrier_template">같은 이동통신사(%s)를 통해 통화하기</string>
+  <string name="incall_calling_on_recent_choice_template">최근 이용했던 이동통신사(%s)를 통해 통화하기</string>
+  <string name="incall_connecting">전화 거는 중…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s(%2$s)번을 사용하여 통화 중…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) 사용 중…</string>
+  <string name="incall_transferring">전환 중…</string>
+  <string name="incall_video_call_requesting">이동통신사 화상 통화 요청 중…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi 이동통신사 화상 통화 요청 중…</string>
+  <string name="incall_video_call_upgrade_request">이동통신사 화상 통화로 전환하는 중…</string>
+  <string name="incall_video_call_request_failed">연결할 수 없습니다.</string>
+  <string name="incall_video_call_request_rejected">통화가 거부되었습니다.</string>
+  <string name="incall_video_call_request_timed_out">통화 시간이 초과되었습니다.</string>
+  <string name="incall_hanging_up">전화 끊는 중</string>
+  <string name="incall_call_ended">통화 종료됨</string>
+  <string name="incall_remotely_held">대기 중</string>
+  <string name="contact_grid_incoming_video_call">다음 사용자에게서 온 이동통신사 화상 통화:</string>
+  <string name="contact_grid_incoming_wifi_video_call">다음 사용자에게서 온 Wi-Fi 이동통신사 화상 통화:</string>
+  <string name="contact_grid_incoming_voice_call">통화 수신:</string>
+  <string name="contact_grid_incoming_work_call">업무 통화 수신:</string>
+  <string name="contact_grid_incoming_via_template">%s을(를) 통해 걸려온 전화</string>
+  <string name="contact_grid_incoming_suspected_spam">스팸으로 의심되는 발신자</string>
+  <string name="contact_grid_callback_number">이 기기의 휴대전화 번호: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
index 2a5db334a..36a887552 100644
--- a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалуу"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Чалуу..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Өткөрүлүүдө…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Байланышуу мүмкүн эмес"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Чалуу четке кагылды"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Чалуунун күтүү убакыты аяктады"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Чалуу аяктоодо"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Чалуу аяктады"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Күтүү режиминде"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Чалып жатат:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Иш боюнча чалып жатат:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалып жатат"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Спам окшойт"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Кайра чалына турган номер: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s аркылуу чалуу</string>
+  <string name="incall_calling_on_same_carrier_template">Ошол эле %s оператору аркылуу чалынууда</string>
+  <string name="incall_calling_on_recent_choice_template">Акыркы тандалган %s оператору аркылуу чалынууда</string>
+  <string name="incall_connecting">Чалуу...</string>
+  <string name="incall_connecting_assited_dialed">Код аркылуу чалуу +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) колдонулууда…</string>
+  <string name="incall_transferring">Өткөрүлүүдө…</string>
+  <string name="incall_video_call_requesting">Видео чалуулар…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi аркылуу видео режиминде чалууда…</string>
+  <string name="incall_video_call_upgrade_request">Байланыш операторунун видеосуна которулуу…</string>
+  <string name="incall_video_call_request_failed">Ката кетти</string>
+  <string name="incall_video_call_request_rejected">Чалуу четке кагылды</string>
+  <string name="incall_video_call_request_timed_out">Чалуунун күтүү убакыты аяктады</string>
+  <string name="incall_hanging_up">Чалуу аяктоодо</string>
+  <string name="incall_call_ended">Чалуу аяктады</string>
+  <string name="incall_remotely_held">Күтүү режиминде</string>
+  <string name="contact_grid_incoming_video_call">Видео чалуу:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi аркылуу видео чалуу:</string>
+  <string name="contact_grid_incoming_voice_call">Чалып жатат:</string>
+  <string name="contact_grid_incoming_work_call">Иш боюнча чалып жатат:</string>
+  <string name="contact_grid_incoming_via_template">%s аркылуу чалып жатат</string>
+  <string name="contact_grid_incoming_suspected_spam">Спам окшойт</string>
+  <string name="contact_grid_callback_number">Бул телефондун номери: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
index 129f6ccdb..3538ef1e2 100644
--- a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"ກຳລັງໂທຜ່ານ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ກຳລັງໂທ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"ກຳລັງໂອນຍ້າຍ…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ສາຍຖືກປະຕິເສດ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ການໂທໝົດເວລາ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ກຳລັງວາງສາຍ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ວາງສາຍແລ້ວ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ຖືສາຍລໍຖ້າ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ການໂທຈາກ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"ສາຍໂທເຂົ້າຈາກ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ຄາດວ່າເປັນການໂທສະແປມ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">ກຳລັງໂທຜ່ານ %s</string>
+  <string name="incall_calling_on_same_carrier_template">ກຳລັງໂທຢູ່ເຄືອຂ່າຍດຽວກັນ %s</string>
+  <string name="incall_calling_on_recent_choice_template">ກຳລັງໂທດ້ວຍຕົວເລືອກຫຼ້າສຸດ %s</string>
+  <string name="incall_connecting">ກຳລັງໂທ…</string>
+  <string name="incall_connecting_assited_dialed">ກຳລັງໂທໂດຍໃຊ້+%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">ໂດຍໃຊ້ +%1$s (%2$s)…</string>
+  <string name="incall_transferring">ກຳລັງໂອນຍ້າຍ…</string>
+  <string name="incall_video_call_requesting">ການໂທວິດີໂອເຄືອຂ່າຍ...</string>
+  <string name="incall_wifi_video_call_requesting">ການໂທວິດີໂອເຄືອຂ່າຍ Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">ກຳລັບສະຫຼັບໄປຫາວິດີໂອເຄືອຂ່າຍ…</string>
+  <string name="incall_video_call_request_failed">ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້</string>
+  <string name="incall_video_call_request_rejected">ສາຍຖືກປະຕິເສດ</string>
+  <string name="incall_video_call_request_timed_out">ການໂທໝົດເວລາ</string>
+  <string name="incall_hanging_up">ກຳລັງວາງສາຍ</string>
+  <string name="incall_call_ended">ວາງສາຍແລ້ວ</string>
+  <string name="incall_remotely_held">ຖືສາຍລໍຖ້າ</string>
+  <string name="contact_grid_incoming_video_call">ການໂທວິດີໂອເຄືອຂ່າຍຈາກ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ການໂທວິດີໂອເຄືອຂ່າຍຈາກ Wi-Fi</string>
+  <string name="contact_grid_incoming_voice_call">ການໂທຈາກ</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">ສາຍໂທເຂົ້າຈາກ %s</string>
+  <string name="contact_grid_incoming_suspected_spam">ຄາດວ່າເປັນການໂທສະແປມ</string>
+  <string name="contact_grid_callback_number">ເບີຂອງໂທລະສັບໜ່ວຍນີ້: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
index 591882727..541b09444 100644
--- a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Skambinama naudojantis „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“ paslaugomis"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Skambinama…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Perkeliama…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nepavyko prisijungti"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Skambutis atmestas"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Baigėsi skirtasis skambučio laikas"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Baigiamas pokalbis"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Skambutis baigtas"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Sulaikytas"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Skambutis nuo"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Darbo skambutis nuo"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Gaunama per „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Įtariamas skambintojas dėl šlamšto"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Atskambinimo numeris: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Skambinama naudojantis „%s“ paslaugomis</string>
+  <string name="incall_calling_on_same_carrier_template">Skambinama naud. to paties operatoriaus paslaugomis: „%s“</string>
+  <string name="incall_calling_on_recent_choice_template">Skambinama naud. dabar pasir. operatoriaus paslaugomis: „%s“</string>
+  <string name="incall_connecting">Skambinama…</string>
+  <string name="incall_connecting_assited_dialed">Skambinama naudojant +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Naudojamas kodas +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Perkeliama…</string>
+  <string name="incall_video_call_requesting">Operatoriaus vaizdo skambutis…</string>
+  <string name="incall_wifi_video_call_requesting">„Wi-Fi“ operatoriaus vaizdo skambutis…</string>
+  <string name="incall_video_call_upgrade_request">Perjungiama į operatoriaus vaizdo skambutį…</string>
+  <string name="incall_video_call_request_failed">Nepavyko prisijungti</string>
+  <string name="incall_video_call_request_rejected">Skambutis atmestas</string>
+  <string name="incall_video_call_request_timed_out">Baigėsi skirtasis skambučio laikas</string>
+  <string name="incall_hanging_up">Baigiamas pokalbis</string>
+  <string name="incall_call_ended">Skambutis baigtas</string>
+  <string name="incall_remotely_held">Sulaikytas</string>
+  <string name="contact_grid_incoming_video_call">Operatoriaus vaizdo skambutis nuo</string>
+  <string name="contact_grid_incoming_wifi_video_call">„Wi-Fi“ operatoriaus vaizdo skambutis nuo</string>
+  <string name="contact_grid_incoming_voice_call">Skambutis nuo</string>
+  <string name="contact_grid_incoming_work_call">Darbo skambutis nuo</string>
+  <string name="contact_grid_incoming_via_template">Gaunama per „%s“</string>
+  <string name="contact_grid_incoming_suspected_spam">Įtariamas skambintojas dėl šlamšto</string>
+  <string name="contact_grid_callback_number">Šio telefono numeris: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
index 446402755..2fe58650b 100644
--- a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Zvanu nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Notiek zvanīšana…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Notiek pārsūtīšana…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nevar izveidot savienojumu"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Zvans ir noraidīts"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Iestājās zvana noildze"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Tiek nolikta klausule"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Zvans ir pabeigts"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Aizturēts"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Zvans no:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Darba zvans no:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Ienākošie zvani, ko nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Nevēlams zvanītājs"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Atzvana numurs: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Zvanu nodrošina %s</string>
+  <string name="incall_calling_on_same_carrier_template">Zvana, izmantojot to pašu mobilo sakaru operatoru: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Zvana, izmantojot nesen izvēlēto mobilo sakaru operatoru: %s</string>
+  <string name="incall_connecting">Notiek zvanīšana…</string>
+  <string name="incall_connecting_assited_dialed">Zvana, izmantojot +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Izmanto +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Notiek pārsūtīšana…</string>
+  <string name="incall_video_call_requesting">Mobilo sakaru operatora videozvans…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi pakalpojuma nodrošinātāja videozvans…</string>
+  <string name="incall_video_call_upgrade_request">Notiek pārslēgšanās uz mobilo sakaru operatora videozvanu…</string>
+  <string name="incall_video_call_request_failed">Nevar izveidot savienojumu</string>
+  <string name="incall_video_call_request_rejected">Zvans ir noraidīts</string>
+  <string name="incall_video_call_request_timed_out">Iestājās zvana noildze</string>
+  <string name="incall_hanging_up">Tiek nolikta klausule</string>
+  <string name="incall_call_ended">Zvans ir pabeigts</string>
+  <string name="incall_remotely_held">Aizturēts</string>
+  <string name="contact_grid_incoming_video_call">Mobilo sakaru operatora videozvans no</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi pakalpojuma nodrošinātāja videozvans no</string>
+  <string name="contact_grid_incoming_voice_call">Zvans no:</string>
+  <string name="contact_grid_incoming_work_call">Darba zvans no:</string>
+  <string name="contact_grid_incoming_via_template">Ienākošie zvani, ko nodrošina %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Nevēlams zvanītājs</string>
+  <string name="contact_grid_callback_number">Šis tālruņa numurs: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
index 450085dc5..61e5069ae 100644
--- a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Повикување преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Се повикува…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Се пренесувa…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не може да се поврзе"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Повикот е одбиен"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Времето за повик истече"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Повикот се прекинува"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Повикот заврши"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На чекање"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Повик од"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Работен повик од"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Дојдовни повици преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Повикот е можен спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Број за повратен повик: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Повикување преку %s</string>
+  <string name="incall_calling_on_same_carrier_template">Повикување на истиот оператор %s</string>
+  <string name="incall_calling_on_recent_choice_template">Повикување на неодамнешен избор %s</string>
+  <string name="incall_connecting">Се повикува…</string>
+  <string name="incall_connecting_assited_dialed">Се повикува со +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Се користи +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Се пренесувa…</string>
+  <string name="incall_video_call_requesting">Се повикува со видео преку оператор…</string>
+  <string name="incall_wifi_video_call_requesting">Се повикува со видео преку Wi-Fi преку оператор…</string>
+  <string name="incall_video_call_upgrade_request">Се префрла на видео преку оператор…</string>
+  <string name="incall_video_call_request_failed">Не може да се поврзе</string>
+  <string name="incall_video_call_request_rejected">Повикот е одбиен</string>
+  <string name="incall_video_call_request_timed_out">Времето за повик истече</string>
+  <string name="incall_hanging_up">Повикот се прекинува</string>
+  <string name="incall_call_ended">Повикот заврши</string>
+  <string name="incall_remotely_held">На чекање</string>
+  <string name="contact_grid_incoming_video_call">Видеоповик преку оператор од</string>
+  <string name="contact_grid_incoming_wifi_video_call">Видеоповик преку Wi-Fi преку оператор од</string>
+  <string name="contact_grid_incoming_voice_call">Повик од</string>
+  <string name="contact_grid_incoming_work_call">Работен повик од</string>
+  <string name="contact_grid_incoming_via_template">Дојдовни повици преку %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Повикот е можен спам</string>
+  <string name="contact_grid_callback_number">Бројот од овој телефон: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
index 59d3365fa..532d6d1ef 100644
--- a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേന വിളിക്കുന്നു"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"വിളിക്കുന്നു..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"കൈമാറുന്നു…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"കണക്റ്റുചെയ്യാനായില്ല"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"കോള്‍ നിരസിച്ചു"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"കോളിന്റെ സമയം തീര്‍ന്നു"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ഹാംഗ് അപ്പ് ചെയ്യുന്നു"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"കോൾ അവസാനിച്ചു"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ഹോള്‍ഡിലാണ്"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ഈ വ്യക്തിയിൽ നിന്നുള്ള കോൾ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ഈ വ്യക്തിയിൽ നിന്നുള്ള ഔദ്യോഗിക കോൾ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേനയുള്ള ഇൻകമിംഗ്"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"സംശയാസ്‌പദമായ സ്‌പാം കോളർ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"തിരിച്ചുവിളിക്കേണ്ട നമ്പർ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s മുഖേന വിളിക്കുന്നു</string>
+  <string name="incall_calling_on_same_carrier_template">സമാന %s കാരിയറിൽ നിന്ന് കോൾ ചെയ്യുന്നു</string>
+  <string name="incall_calling_on_recent_choice_template">സമീപകാലത്ത് തിരഞ്ഞെടുത്ത %s-ൽ കോൾ ചെയ്യുന്നു</string>
+  <string name="incall_connecting">വിളിക്കുന്നു...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s ഉപയോഗിച്ച് വിളിക്കുന്നു (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ഉപയോഗിക്കുന്നു…</string>
+  <string name="incall_transferring">കൈമാറുന്നു…</string>
+  <string name="incall_video_call_requesting">കാരിയർ വീഡിയോ കോൾ ചെയ്യുന്നു...</string>
+  <string name="incall_wifi_video_call_requesting">വൈഫൈ കാരിയർ വീഡിയോ കോൾ ചെയ്യുന്നു...</string>
+  <string name="incall_video_call_upgrade_request">കാരിയർ വീഡിയോയിലേക്ക് മാറുന്നു...</string>
+  <string name="incall_video_call_request_failed">കണക്റ്റുചെയ്യാനായില്ല</string>
+  <string name="incall_video_call_request_rejected">കോള്‍ നിരസിച്ചു</string>
+  <string name="incall_video_call_request_timed_out">കോളിന്റെ സമയം തീര്‍ന്നു</string>
+  <string name="incall_hanging_up">ഹാംഗ് അപ്പ് ചെയ്യുന്നു</string>
+  <string name="incall_call_ended">കോൾ അവസാനിച്ചു</string>
+  <string name="incall_remotely_held">ഹോള്‍ഡിലാണ്</string>
+  <string name="contact_grid_incoming_video_call">ഇയാളിൽ നിന്നുള്ള വീഡിയോ കോൾ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ഇയാളിൽ നിന്നുള്ള വൈഫൈ കാരിയർ വീഡിയോ കോൾ</string>
+  <string name="contact_grid_incoming_voice_call">ഈ വ്യക്തിയിൽ നിന്നുള്ള കോൾ</string>
+  <string name="contact_grid_incoming_work_call">ഈ വ്യക്തിയിൽ നിന്നുള്ള ഔദ്യോഗിക കോൾ</string>
+  <string name="contact_grid_incoming_via_template">%s മുഖേനയുള്ള ഇൻകമിംഗ്</string>
+  <string name="contact_grid_incoming_suspected_spam">സംശയാസ്‌പദമായ സ്‌പാം കോളർ</string>
+  <string name="contact_grid_callback_number">ഈ ഫോണിന്‍റെ നമ്പർ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
index be233136e..8304a79fb 100644
--- a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-р залгаж байна"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Залгаж байна..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Шилжүүлж байна..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Холбогдох боломжгүй"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Дуудлагыг тасласан"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Дуудлагын хугацаа хэтэрсэн"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Тасалж байна"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Дуудлагыг тасалсан"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Хүлээлгэнд байгаа"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Дуудлага"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ажлын дуудлага"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-р ирж байна"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Сэжигтэй спам дуудлага хийгч"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Буцаан залгах дугаар: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s-р залгаж байна</string>
+  <string name="incall_calling_on_same_carrier_template">Ижилхэн %s үүрэн холбооны компаниарс залгаж байна</string>
+  <string name="incall_calling_on_recent_choice_template">Саяхны сонголт %s-р залгаж байна</string>
+  <string name="incall_connecting">Залгаж байна...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) ашиглан залгаж байна…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ашиглаж байна…</string>
+  <string name="incall_transferring">Шилжүүлж байна...</string>
+  <string name="incall_video_call_requesting">Үүрэн компанийн видео дуудлага...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi үүрэн компанийн видео дуудлага…</string>
+  <string name="incall_video_call_upgrade_request">Үүрэн компанийн видео дуудлага руу сэлгэж байна…</string>
+  <string name="incall_video_call_request_failed">Холбогдох боломжгүй</string>
+  <string name="incall_video_call_request_rejected">Дуудлагыг тасласан</string>
+  <string name="incall_video_call_request_timed_out">Дуудлагын хугацаа хэтэрсэн</string>
+  <string name="incall_hanging_up">Тасалж байна</string>
+  <string name="incall_call_ended">Дуудлагыг тасалсан</string>
+  <string name="incall_remotely_held">Хүлээлгэнд байгаа</string>
+  <string name="contact_grid_incoming_video_call">Үүрэн компанийн видео дуудлага</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi үүрэн компанийн видео дуудлага</string>
+  <string name="contact_grid_incoming_voice_call">Дуудлага</string>
+  <string name="contact_grid_incoming_work_call">Ажлын дуудлага</string>
+  <string name="contact_grid_incoming_via_template">%s-р ирж байна</string>
+  <string name="contact_grid_incoming_suspected_spam">Сэжигтэй спам дуудлага хийгч</string>
+  <string name="contact_grid_callback_number">Энэ утасны дугаар: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
index c0cef5c10..106f852fa 100644
--- a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे कॉल करीत आहे"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"कॉल करीत आहे..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"हस्तांतरित करीत आहे..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"कनेक्ट करण्यात अक्षम"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"कॉल नाकारला"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"कॉल कालबाह्य"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"हँग अप करणेे"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"कॉल संपला"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"होल्ड वर"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"यावरील कॉल"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"कडून कार्य कॉल"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे येणारे"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"संशयित स्पॅम कॉलर"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"कॉलबॅक नंबर: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s द्वारे कॉल करत आहे</string>
+  <string name="incall_calling_on_same_carrier_template">समान %s वाहकावर कॉल करत आहोत</string>
+  <string name="incall_calling_on_recent_choice_template">अलीकडे निवडलेल्‍या %s वर कॉल करत आहोत</string>
+  <string name="incall_connecting">कॉल करत आहे...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) वापरून कॉल करत आहे…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) वापरत आहे…</string>
+  <string name="incall_transferring">हस्तांतरित करत आहे...</string>
+  <string name="incall_video_call_requesting">वाहक व्हिडिओ कॉलिंग…</string>
+  <string name="incall_wifi_video_call_requesting">वाय-फाय वाहक व्हिडिओ कॉलिंग…</string>
+  <string name="incall_video_call_upgrade_request">वाहक व्हिडिओवर स्विच होत आहे…</string>
+  <string name="incall_video_call_request_failed">कनेक्ट करण्यात अक्षम</string>
+  <string name="incall_video_call_request_rejected">कॉल नाकारला</string>
+  <string name="incall_video_call_request_timed_out">कॉल कालबाह्य</string>
+  <string name="incall_hanging_up">हँग अप करणेे</string>
+  <string name="incall_call_ended">कॉल संपला</string>
+  <string name="incall_remotely_held">होल्ड वर</string>
+  <string name="contact_grid_incoming_video_call">या व्‍यक्‍तीकडून वाहक व्हिडिओ कॉल</string>
+  <string name="contact_grid_incoming_wifi_video_call">या व्‍यक्‍तीकडून वाय-फाय वाहक व्हिडिओ कॉल</string>
+  <string name="contact_grid_incoming_voice_call">यावरील कॉल</string>
+  <string name="contact_grid_incoming_work_call">कडून कार्य कॉल</string>
+  <string name="contact_grid_incoming_via_template">%s द्वारे येणारे</string>
+  <string name="contact_grid_incoming_suspected_spam">संशयित स्पॅम कॉलर</string>
+  <string name="contact_grid_callback_number">या फोनचा क्रमांक: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
index eaacc4580..f38c2caec 100644
--- a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Memanggil melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Memanggil…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Memindahkan…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Tidak dapat menyambung"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Panggilan ditolak"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Panggilan tamat masa"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Menamatkan panggilan"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Panggilan tamat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Panggilan ditahan"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Panggilan daripada"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Panggilan kerja daripada"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Panggilan masuk melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Disyaki pemanggil spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nombor panggil balik: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Memanggil melalui %s</string>
+  <string name="incall_calling_on_same_carrier_template">Memanggil menggunakan pembawa yang sama %s</string>
+  <string name="incall_calling_on_recent_choice_template">Memanggil menggunakan pilihan terbaharu %s</string>
+  <string name="incall_connecting">Memanggil…</string>
+  <string name="incall_connecting_assited_dialed">Memanggil dengan menggunakan +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Menggunakan +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Memindahkan…</string>
+  <string name="incall_video_call_requesting">Panggilan video pembawa…</string>
+  <string name="incall_wifi_video_call_requesting">Panggilan video pembawa Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Bertukar kepada video pembawa…</string>
+  <string name="incall_video_call_request_failed">Tidak dapat menyambung</string>
+  <string name="incall_video_call_request_rejected">Panggilan ditolak</string>
+  <string name="incall_video_call_request_timed_out">Panggilan tamat masa</string>
+  <string name="incall_hanging_up">Menamatkan panggilan</string>
+  <string name="incall_call_ended">Panggilan tamat</string>
+  <string name="incall_remotely_held">Panggilan ditahan</string>
+  <string name="contact_grid_incoming_video_call">Panggilan video pembawa daripada</string>
+  <string name="contact_grid_incoming_wifi_video_call">Panggilan video pembawa Wi-Fi daripada</string>
+  <string name="contact_grid_incoming_voice_call">Panggilan daripada</string>
+  <string name="contact_grid_incoming_work_call">Panggilan kerja daripada</string>
+  <string name="contact_grid_incoming_via_template">Panggilan masuk melalui %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Disyaki pemanggil spam</string>
+  <string name="contact_grid_callback_number">Nombor telefon ini: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-my/strings.xml b/java/com/android/incallui/contactgrid/res/values-my/strings.xml
index 25088c350..ca7e8381a 100644
--- a/java/com/android/incallui/contactgrid/res/values-my/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-my/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှတစ်ဆင့် ခေါ်ဆိုနေသည်"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ခေါ်ဆိုနေသည်…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"လွှဲပြောင်းနေသည်…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ချိတ်ဆက်၍ မရပါ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ခေါ်ဆိုမှုကို ငြင်းပယ်လိုက်ပါသည်"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ခေါ်ဆိုမှု အချိန်ကုန်ဆုံးသွားပါပြီ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ဖုန်းချနေပါသည်"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ခေါ်ဆိုမှု ပြီးသွားပါပြီ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ဖုန်းကိုင်ထားသည်"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"အောက်ပါထံမှ ခေါ်ဆိုမှု"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"အောက်ပါထံမှ အလုပ်ခေါ်ဆိုမှု"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုသူ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ပြန်လည်ခေါ်ဆိုရန်နံပါတ် - <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s မှတစ်ဆင့် ခေါ်ဆိုနေသည်</string>
+  <string name="incall_calling_on_same_carrier_template">တူညီသော ဖုန်းလိုင်း %s မှ ခေါ်ဆိုခြင်း</string>
+  <string name="incall_calling_on_recent_choice_template">လတ်တလော ရွေးချယ်မှု %s မှ ခေါ်ဆိုခြင်း</string>
+  <string name="incall_connecting">ခေါ်ဆိုနေသည်…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s)… သုံးပြီး ဖုန်းခေါ်ဆိုခြင်း</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ကို အသုံးပြုထားသည်…</string>
+  <string name="incall_transferring">လွှဲပြောင်းနေသည်…</string>
+  <string name="incall_video_call_requesting">ဝန်ဆောင်မှုပေးသူဗီဒီယို ခေါ်ဆိုနေသည်...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi ဝန်ဆောင်မှုပေးသူဗီဒီယို ခေါ်ဆိုနေသည်...</string>
+  <string name="incall_video_call_upgrade_request">ဝန်ဆောင်မှုပေးသူဗီဒီယိုသို့ ပြောင်းနေသည်…</string>
+  <string name="incall_video_call_request_failed">ချိတ်ဆက်၍ မရပါ</string>
+  <string name="incall_video_call_request_rejected">ခေါ်ဆိုမှုကို ငြင်းပယ်လိုက်ပါသည်</string>
+  <string name="incall_video_call_request_timed_out">ခေါ်ဆိုမှု အချိန်ကုန်ဆုံးသွားပါပြီ</string>
+  <string name="incall_hanging_up">ဖုန်းချနေပါသည်</string>
+  <string name="incall_call_ended">ခေါ်ဆိုမှု ပြီးသွားပါပြီ</string>
+  <string name="incall_remotely_held">ဖုန်းကိုင်ထားသည်</string>
+  <string name="contact_grid_incoming_video_call">အောက်ပါထံမှ ဝန်ဆောင်မှုပေးသူဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_wifi_video_call">အောက်ပါထံမှ Wi-Fi ဝန်ဆောင်မှုပေးသူ ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_voice_call">အောက်ပါထံမှ ခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_work_call">အောက်ပါထံမှ အလုပ်ခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_via_template">%s မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_suspected_spam">မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုသူ</string>
+  <string name="contact_grid_callback_number">ဤဖုန်း၏နံပါတ် - %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
index e4127f951..5ae6ecd6a 100644
--- a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overfører …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan ikke koble til"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Anropet ble avvist"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Anropet ble tidsavbrutt"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Legger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Samtalen er avsluttet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"På vent"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anrop fra"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbrelatert anrop fra"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Innkommende via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Sannsynligvis et useriøst anrop"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nummer hvis du vil ringe tilbake: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Ringer via samme mobiloperatør: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Ringer via nylig valgt: %s</string>
+  <string name="incall_connecting">Ringer …</string>
+  <string name="incall_connecting_assited_dialed">Ringer med +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Bruker +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Overfører …</string>
+  <string name="incall_video_call_requesting">Videoanrop via mobiloperatør …</string>
+  <string name="incall_wifi_video_call_requesting">Videoanrop via Wi-Fi …</string>
+  <string name="incall_video_call_upgrade_request">Bytter til videoanrop via mobiloperatør …</string>
+  <string name="incall_video_call_request_failed">Kan ikke koble til</string>
+  <string name="incall_video_call_request_rejected">Anropet ble avvist</string>
+  <string name="incall_video_call_request_timed_out">Anropet ble tidsavbrutt</string>
+  <string name="incall_hanging_up">Legger på</string>
+  <string name="incall_call_ended">Samtalen er avsluttet</string>
+  <string name="incall_remotely_held">På vent</string>
+  <string name="contact_grid_incoming_video_call">Videoanrop via mobiloperatør fra</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videoanrop via Wi-Fi fra</string>
+  <string name="contact_grid_incoming_voice_call">Anrop fra</string>
+  <string name="contact_grid_incoming_work_call">Jobbrelatert anrop fra</string>
+  <string name="contact_grid_incoming_via_template">Innkommende via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Sannsynligvis et useriøst anrop</string>
+  <string name="contact_grid_callback_number">Nummeret til denne telefonen: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
index f56c90f4f..450785805 100644
--- a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> मार्फत कल गर्दै"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"कल गर्दै…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"स्थानान्तरण गर्दै…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"जडान गर्न असमर्थ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"कल अस्वीकार गरियो"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"कलको समय सकियो"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"फोन काट्दै"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"कल समाप्त भयो"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"होल्डमा छ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"निम्नबाट कल आएको छ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"निम्नबाट कार्य सम्बन्धी कल आएको छ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> मार्फत गरिएको आगमन कल"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"शङ्कास्पद स्प्याम कल गर्ने व्यक्ति"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"कलब्याकको नम्बर: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s मार्फत कल गर्दै</string>
+  <string name="incall_calling_on_same_carrier_template">उ‍ही सेवा प्रदायक %s मा कल गर्दै</string>
+  <string name="incall_calling_on_recent_choice_template">हालैको रोजाइको %s मस कल गर्दै</string>
+  <string name="incall_connecting">कल गर्दै…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) प्रयोग गरी कल गर्दै…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) प्रयोग गर्दै…</string>
+  <string name="incall_transferring">स्थानान्तरण गर्दै…</string>
+  <string name="incall_video_call_requesting">सेवा प्रदायकमार्फत भिडियो कल गर्दै…</string>
+  <string name="incall_wifi_video_call_requesting">सेवा प्रदायकमार्फत Wi-Fi भिडियो कलमा स्तरवृद्धिका लागि अनुरोध गर्दै…</string>
+  <string name="incall_video_call_upgrade_request">सेवा प्रदायकमार्फतको भिडियो कलमा स्विच गर्दै…</string>
+  <string name="incall_video_call_request_failed">जडान गर्न असमर्थ</string>
+  <string name="incall_video_call_request_rejected">कल अस्वीकार गरियो</string>
+  <string name="incall_video_call_request_timed_out">कलको समय सकियो</string>
+  <string name="incall_hanging_up">फोन काट्दै</string>
+  <string name="incall_call_ended">कल समाप्त भयो</string>
+  <string name="incall_remotely_held">होल्डमा छ</string>
+  <string name="contact_grid_incoming_video_call">यहाँबाट आएको सेवा प्रदायकमार्फतको भिडियो कल</string>
+  <string name="contact_grid_incoming_wifi_video_call">यहाँबाट आएको सेवा प्रदायकमार्फतको Wi-Fi भिडियो कल</string>
+  <string name="contact_grid_incoming_voice_call">निम्नबाट कल आएको छ</string>
+  <string name="contact_grid_incoming_work_call">निम्नबाट कार्य सम्बन्धी कल आएको छ</string>
+  <string name="contact_grid_incoming_via_template">%s मार्फत गरिएको आगमन कल</string>
+  <string name="contact_grid_incoming_suspected_spam">शङ्कास्पद स्प्याम कल गर्ने व्यक्ति</string>
+  <string name="contact_grid_callback_number">यस फोनको नम्बर: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
index ad4d00ddd..73b073c71 100644
--- a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Bellen via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Bellen…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overzetten…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan geen verbinding maken"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Oproep geweigerd"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Time-out tijdens oproep"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Ophangen"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Oproep beëindigd"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"In de wacht"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Oproep van"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Zakelijke oproep van"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkomend via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Vermoedelijke spambeller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Terugbelnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Bellen via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Op dezelfde provider %s bellen</string>
+  <string name="incall_calling_on_recent_choice_template">Op recente keuze %s bellen</string>
+  <string name="incall_connecting">Bellen…</string>
+  <string name="incall_connecting_assited_dialed">Bellen met +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) gebruiken…</string>
+  <string name="incall_transferring">Overzetten…</string>
+  <string name="incall_video_call_requesting">Videogesprek via provider…</string>
+  <string name="incall_wifi_video_call_requesting">Wifi-videogesprek via provider…</string>
+  <string name="incall_video_call_upgrade_request">Overschakelen naar videogesprek via provider…</string>
+  <string name="incall_video_call_request_failed">Kan geen verbinding maken</string>
+  <string name="incall_video_call_request_rejected">Oproep geweigerd</string>
+  <string name="incall_video_call_request_timed_out">Time-out tijdens oproep</string>
+  <string name="incall_hanging_up">Ophangen</string>
+  <string name="incall_call_ended">Oproep beëindigd</string>
+  <string name="incall_remotely_held">In de wacht</string>
+  <string name="contact_grid_incoming_video_call">Videogesprek via je provider met</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wifi-videogesprek via je provider met</string>
+  <string name="contact_grid_incoming_voice_call">Oproep van</string>
+  <string name="contact_grid_incoming_work_call">Zakelijke oproep van</string>
+  <string name="contact_grid_incoming_via_template">Inkomend via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Vermoedelijke spambeller</string>
+  <string name="contact_grid_callback_number">Dit telefoonnummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-no/strings.xml b/java/com/android/incallui/contactgrid/res/values-no/strings.xml
index e4127f951..5ae6ecd6a 100644
--- a/java/com/android/incallui/contactgrid/res/values-no/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-no/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overfører …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan ikke koble til"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Anropet ble avvist"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Anropet ble tidsavbrutt"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Legger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Samtalen er avsluttet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"På vent"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anrop fra"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbrelatert anrop fra"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Innkommende via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Sannsynligvis et useriøst anrop"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nummer hvis du vil ringe tilbake: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Ringer via samme mobiloperatør: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Ringer via nylig valgt: %s</string>
+  <string name="incall_connecting">Ringer …</string>
+  <string name="incall_connecting_assited_dialed">Ringer med +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Bruker +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Overfører …</string>
+  <string name="incall_video_call_requesting">Videoanrop via mobiloperatør …</string>
+  <string name="incall_wifi_video_call_requesting">Videoanrop via Wi-Fi …</string>
+  <string name="incall_video_call_upgrade_request">Bytter til videoanrop via mobiloperatør …</string>
+  <string name="incall_video_call_request_failed">Kan ikke koble til</string>
+  <string name="incall_video_call_request_rejected">Anropet ble avvist</string>
+  <string name="incall_video_call_request_timed_out">Anropet ble tidsavbrutt</string>
+  <string name="incall_hanging_up">Legger på</string>
+  <string name="incall_call_ended">Samtalen er avsluttet</string>
+  <string name="incall_remotely_held">På vent</string>
+  <string name="contact_grid_incoming_video_call">Videoanrop via mobiloperatør fra</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videoanrop via Wi-Fi fra</string>
+  <string name="contact_grid_incoming_voice_call">Anrop fra</string>
+  <string name="contact_grid_incoming_work_call">Jobbrelatert anrop fra</string>
+  <string name="contact_grid_incoming_via_template">Innkommende via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Sannsynligvis et useriøst anrop</string>
+  <string name="contact_grid_callback_number">Nummeret til denne telefonen: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
index 96e9dd16e..9dda0c6df 100644
--- a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"ਤਬਾਦਲਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ਕਨੈਕਟ ਕਰਨ ਦੇ ਅਯੋਗ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ਕਾਲ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ਕਾਲ ਦਾ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ਸਮਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ਕਾਲ ਸਮਾਪਤ ਹੋਈ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ਇਸ ਤੋਂ ਕਾਲ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ਇਸ ਤੋਂ ਕੰਮ ਸਬੰਧੀ ਕਾਲ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ਰਾਹੀਂ ਇਨਕਮਿੰਗ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ਕਾਲਬੈਕ ਨੰਬਰ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_calling_on_same_carrier_template">ਇੱਕੋ ਕੈਰੀਅਰ %s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_calling_on_recent_choice_template">ਹਾਲ ਹੀ ਵਿੱਚ ਚੁਣੇ ਗਏ %s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_connecting">ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) ਲਗਾ ਕੇ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ਨੂੰ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="incall_transferring">ਤਬਾਦਲਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="incall_video_call_requesting">ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ…</string>
+  <string name="incall_wifi_video_call_requesting">ਵਾਈ-ਫਾਈ ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ…</string>
+  <string name="incall_video_call_upgrade_request">ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲੱਗੇ ਹਾਂ…</string>
+  <string name="incall_video_call_request_failed">ਕਨੈਕਟ ਕਰਨ ਦੇ ਅਯੋਗ</string>
+  <string name="incall_video_call_request_rejected">ਕਾਲ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ</string>
+  <string name="incall_video_call_request_timed_out">ਕਾਲ ਦਾ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ</string>
+  <string name="incall_hanging_up">ਸਮਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_call_ended">ਕਾਲ ਸਮਾਪਤ ਹੋਈ</string>
+  <string name="incall_remotely_held">ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ</string>
+  <string name="contact_grid_incoming_video_call">ਇਸ ਵੱਲੋਂ ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ਇਸ ਵੱਲੋਂ ਵਾਈ-ਫਾਈ ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="contact_grid_incoming_voice_call">ਇਸ ਤੋਂ ਕਾਲ</string>
+  <string name="contact_grid_incoming_work_call">ਇਸ ਤੋਂ ਕੰਮ ਸਬੰਧੀ ਕਾਲ</string>
+  <string name="contact_grid_incoming_via_template">%s ਰਾਹੀਂ ਇਨਕਮਿੰਗ</string>
+  <string name="contact_grid_incoming_suspected_spam">ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ</string>
+  <string name="contact_grid_callback_number">ਇਸ ਫ਼ੋਨ ਦਾ ਨੰਬਰ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
index e42545a78..6f27574cf 100644
--- a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Dzwonię przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Dzwonię…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Przekazuję…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nie udało się połączyć"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Połączenie zostało odrzucone"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Osiągnięto limit czasu połączenia"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Rozłączam"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Połączenie zakończone"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Oczekujące"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Połączenie z:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Połączenie służbowe z:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Przychodzące z sieci <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Podejrzenie spamu"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numer oddzwaniania: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Dzwonię przez %s</string>
+  <string name="incall_calling_on_same_carrier_template">Dzwonię, korzystając z usług tego samego operatora (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Dzwonię, korzystając z ostatnio wybranego operatora (%s)</string>
+  <string name="incall_connecting">Dzwonię…</string>
+  <string name="incall_connecting_assited_dialed">Dzwonię z: +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Używam +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Przekazuję…</string>
+  <string name="incall_video_call_requesting">Rozpoczynam rozmowę wideo przez sieć operatora…</string>
+  <string name="incall_wifi_video_call_requesting">Rozpoczynam rozmowę wideo przez Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Przełączam na rozmowę wideo przez sieć operatora…</string>
+  <string name="incall_video_call_request_failed">Nie udało się połączyć</string>
+  <string name="incall_video_call_request_rejected">Połączenie zostało odrzucone</string>
+  <string name="incall_video_call_request_timed_out">Osiągnięto limit czasu połączenia</string>
+  <string name="incall_hanging_up">Rozłączam</string>
+  <string name="incall_call_ended">Połączenie zakończone</string>
+  <string name="incall_remotely_held">Oczekujące</string>
+  <string name="contact_grid_incoming_video_call">Rozmowa wideo przez sieć operatora z</string>
+  <string name="contact_grid_incoming_wifi_video_call">Rozmowa wideo przez Wi-Fi z</string>
+  <string name="contact_grid_incoming_voice_call">Połączenie z:</string>
+  <string name="contact_grid_incoming_work_call">Połączenie służbowe z:</string>
+  <string name="contact_grid_incoming_via_template">Przychodzące z sieci %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Podejrzenie spamu</string>
+  <string name="contact_grid_callback_number">Numer tego telefonu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
index 606bad317..2772446df 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ligando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ligando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferindo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Não foi possível conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chamada recusada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Chamada expirada"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Desligando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chamada encerrada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Autor da chamada suspeito de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de retorno de chamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ligando via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Usando a mesma operadora para ligar: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Usando a última opção para ligar: %s</string>
+  <string name="incall_connecting">Ligando…</string>
+  <string name="incall_connecting_assited_dialed">Chamada usando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Usando +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferindo…</string>
+  <string name="incall_video_call_requesting">Fazendo videochamada via operadora...</string>
+  <string name="incall_wifi_video_call_requesting">Fazendo videochamada via operadora de Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Alternando para videochamada via operadora…</string>
+  <string name="incall_video_call_request_failed">Não foi possível conectar</string>
+  <string name="incall_video_call_request_rejected">Chamada recusada</string>
+  <string name="incall_video_call_request_timed_out">Chamada expirada</string>
+  <string name="incall_hanging_up">Desligando</string>
+  <string name="incall_call_ended">Chamada encerrada</string>
+  <string name="incall_remotely_held">Em espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada via operadora feita por</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada via operadora de Wi-Fi feita por</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de trabalho de</string>
+  <string name="contact_grid_incoming_via_template">Chamada de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Autor da chamada suspeito de spam</string>
+  <string name="contact_grid_callback_number">O número deste smartphone: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
index 8eae675ff..4f9be6951 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"A telefonar através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>…"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"A chamar…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"A transferir…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Não é possível estabelecer ligação"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chamada recusada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"A chamada expirou"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"A desligar…"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chamada terminada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada recebida através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Autor suspeito de chamadas de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de retorno de chamadas: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">A telefonar através de %s…</string>
+  <string name="incall_calling_on_same_carrier_template">A ligar pelo mesmo operador %s</string>
+  <string name="incall_calling_on_recent_choice_template">A ligar pela escolha mais recente %s</string>
+  <string name="incall_connecting">A chamar…</string>
+  <string name="incall_connecting_assited_dialed">A ligar através de +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">A utilizar +%1$s (%2$s)…</string>
+  <string name="incall_transferring">A transferir…</string>
+  <string name="incall_video_call_requesting">Videochamada do operador…</string>
+  <string name="incall_wifi_video_call_requesting">Videochamada do operador por Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">A mudar para videochamada do operador…</string>
+  <string name="incall_video_call_request_failed">Não é possível estabelecer ligação</string>
+  <string name="incall_video_call_request_rejected">Chamada recusada</string>
+  <string name="incall_video_call_request_timed_out">A chamada expirou</string>
+  <string name="incall_hanging_up">A desligar…</string>
+  <string name="incall_call_ended">Chamada terminada</string>
+  <string name="incall_remotely_held">Em espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada do operador de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada do operador por Wi-Fi de</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de trabalho de</string>
+  <string name="contact_grid_incoming_via_template">Chamada recebida através de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Autor suspeito de chamadas de spam</string>
+  <string name="contact_grid_callback_number">O número deste telemóvel: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
index 606bad317..2772446df 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ligando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ligando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferindo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Não foi possível conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chamada recusada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Chamada expirada"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Desligando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chamada encerrada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Autor da chamada suspeito de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de retorno de chamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ligando via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Usando a mesma operadora para ligar: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Usando a última opção para ligar: %s</string>
+  <string name="incall_connecting">Ligando…</string>
+  <string name="incall_connecting_assited_dialed">Chamada usando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Usando +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferindo…</string>
+  <string name="incall_video_call_requesting">Fazendo videochamada via operadora...</string>
+  <string name="incall_wifi_video_call_requesting">Fazendo videochamada via operadora de Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Alternando para videochamada via operadora…</string>
+  <string name="incall_video_call_request_failed">Não foi possível conectar</string>
+  <string name="incall_video_call_request_rejected">Chamada recusada</string>
+  <string name="incall_video_call_request_timed_out">Chamada expirada</string>
+  <string name="incall_hanging_up">Desligando</string>
+  <string name="incall_call_ended">Chamada encerrada</string>
+  <string name="incall_remotely_held">Em espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada via operadora feita por</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada via operadora de Wi-Fi feita por</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de trabalho de</string>
+  <string name="contact_grid_incoming_via_template">Chamada de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Autor da chamada suspeito de spam</string>
+  <string name="contact_grid_callback_number">O número deste smartphone: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
index 3dd70575d..edd651098 100644
--- a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Se apelează prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Se apelează…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Se transferă…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nu se poate conecta"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Apelul a fost respins"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Durata de apelare a expirat"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Se încheie apelul"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Apel încheiat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"În așteptare"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Apel primit de la"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Apel de serviciu de la"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Primite prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Posibil apelant spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Număr de apelare inversă: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Se apelează prin %s</string>
+  <string name="incall_calling_on_same_carrier_template">Se apelează în rețeaua aceluiași operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Se apelează în rețeaua operatorului ales recent %s</string>
+  <string name="incall_connecting">Se apelează…</string>
+  <string name="incall_connecting_assited_dialed">Se apelează folosind +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Se folosește +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Se transferă…</string>
+  <string name="incall_video_call_requesting">Se apelează video prin operator…</string>
+  <string name="incall_wifi_video_call_requesting">Se apelează video prin operator Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Se comută la apelul video prin operator…</string>
+  <string name="incall_video_call_request_failed">Nu se poate conecta</string>
+  <string name="incall_video_call_request_rejected">Apelul a fost respins</string>
+  <string name="incall_video_call_request_timed_out">Durata de apelare a expirat</string>
+  <string name="incall_hanging_up">Se încheie apelul</string>
+  <string name="incall_call_ended">Apel încheiat</string>
+  <string name="incall_remotely_held">În așteptare</string>
+  <string name="contact_grid_incoming_video_call">Apel video prin operator de la</string>
+  <string name="contact_grid_incoming_wifi_video_call">Apel video prin operator Wi-Fi de la</string>
+  <string name="contact_grid_incoming_voice_call">Apel primit de la</string>
+  <string name="contact_grid_incoming_work_call">Apel de serviciu de la</string>
+  <string name="contact_grid_incoming_via_template">Primite prin %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Posibil apelant spam</string>
+  <string name="contact_grid_callback_number">Numărul acestui telefon: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
index 4f3fa8bad..1931dcf99 100644
--- a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Вызов через <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Вызов…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Перевод вызова…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не удалось установить соединение"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Вызов отклонен"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Время ожидания истекло"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Завершение вызова…"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Вызов завершен"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На удержании"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Вызов от"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Рабочий вызов от"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Входящий вызов (оператор: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Подозрение на спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Номер обратного вызова: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Вызов через %s</string>
+  <string name="incall_calling_on_same_carrier_template">Звонок через того же оператора, %s</string>
+  <string name="incall_calling_on_recent_choice_template">Звонок через недавно выбранного оператора, %s</string>
+  <string name="incall_connecting">Вызов…</string>
+  <string name="incall_connecting_assited_dialed">Звонок через код +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Используется код +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Перевод вызова…</string>
+  <string name="incall_video_call_requesting">Видеовызов…</string>
+  <string name="incall_wifi_video_call_requesting">Видеовызов по Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Переключение на видеовызов…</string>
+  <string name="incall_video_call_request_failed">Не удалось установить соединение</string>
+  <string name="incall_video_call_request_rejected">Вызов отклонен</string>
+  <string name="incall_video_call_request_timed_out">Время ожидания истекло</string>
+  <string name="incall_hanging_up">Завершение вызова…</string>
+  <string name="incall_call_ended">Вызов завершен</string>
+  <string name="incall_remotely_held">На удержании</string>
+  <string name="contact_grid_incoming_video_call">Видеовызов от:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Видеовызов по Wi-Fi от:</string>
+  <string name="contact_grid_incoming_voice_call">Вызов от</string>
+  <string name="contact_grid_incoming_work_call">Рабочий вызов от</string>
+  <string name="contact_grid_incoming_via_template">Входящий вызов на %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Подозрение на спам</string>
+  <string name="contact_grid_callback_number">Номер этого телефона: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-si/strings.xml b/java/com/android/incallui/contactgrid/res/values-si/strings.xml
index 6eead50c0..b165140ca 100644
--- a/java/com/android/incallui/contactgrid/res/values-si/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-si/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> හරහා අමතමින්"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"අමතමින්…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"මාරු කරමින්…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"සම්බන්ධ වීමට නොහැකිය"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ඇමතුම ප්‍රතික්ෂේප කෙරණි"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ඇමතුම් කාලය නිමා විය"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"විසන්ධි කරමින්"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ඇමතුම අවසන් විය"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"රඳවා ගත්"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"වෙතින් ඇමතුම"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"වෙතින් කාර්යාල ඇමතුම"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> හරහා එන"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"සැකසහිත අයාචිත තැපැල් අමතන්නා"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"පසුඇමතුම් අංකය: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s හරහා අමතමින්</string>
+  <string name="incall_calling_on_same_carrier_template">එකම %s වාහකයෙහි අමතමින්</string>
+  <string name="incall_calling_on_recent_choice_template">මෑත %s තේරීමෙහි අමතමින්</string>
+  <string name="incall_connecting">අමතමින්…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) භාවිතයෙන් අමතමින්…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) භාවිත කරමින්…</string>
+  <string name="incall_transferring">මාරු කරමින්…</string>
+  <string name="incall_video_call_requesting">වාහක වීඩියෝ ඇමතීම…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi වාහක වීඩියෝ ඇමතීම…</string>
+  <string name="incall_video_call_upgrade_request">වාහක වීඩියෝවට මාරු වෙමින්…</string>
+  <string name="incall_video_call_request_failed">සම්බන්ධ වීමට නොහැකිය</string>
+  <string name="incall_video_call_request_rejected">ඇමතුම ප්‍රතික්ෂේප කෙරණි</string>
+  <string name="incall_video_call_request_timed_out">ඇමතුම් කාලය නිමා විය</string>
+  <string name="incall_hanging_up">විසන්ධි කරමින්</string>
+  <string name="incall_call_ended">ඇමතුම අවසන් විය</string>
+  <string name="incall_remotely_held">රඳවා ගත්</string>
+  <string name="contact_grid_incoming_video_call">වෙතින් වාහක වීඩියෝ ඇමතුම</string>
+  <string name="contact_grid_incoming_wifi_video_call">වෙතින් Wi-Fi වාහක වීඩියෝ ඇමතුම</string>
+  <string name="contact_grid_incoming_voice_call">වෙතින් ඇමතුම</string>
+  <string name="contact_grid_incoming_work_call">වෙතින් කාර්යාල ඇමතුම</string>
+  <string name="contact_grid_incoming_via_template">%s හරහා එන</string>
+  <string name="contact_grid_incoming_suspected_spam">සැකසහිත අයාචිත තැපැල් අමතන්නා</string>
+  <string name="contact_grid_callback_number">මෙම දුරකථනයෙහි අංකය වන්නේ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
index 2d46f5f8d..4aab19bef 100644
--- a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Voláte prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Prebieha hovor…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenáša sa…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Pripojenie nie je možné"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Hovor bol odmietnutý"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Časový limit hovoru uplynul"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Ukončuje sa hovor"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Hovor bol ukončený"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Podržané"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Hovor od:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Pracovný hovor od:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Prichádzajúci hovor prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Podozrenie na spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Číslo na spätné volanie: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Voláte prostredníctvom poskytovateľa %s</string>
+  <string name="incall_calling_on_same_carrier_template">Volá sa cez rovnakého operátora %s</string>
+  <string name="incall_calling_on_recent_choice_template">Volá sa cez nedávno vybraného operátora %s</string>
+  <string name="incall_connecting">Prebieha hovor…</string>
+  <string name="incall_connecting_assited_dialed">Volá sa s predvoľbou +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Bola použitá predvoľba +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenáša sa…</string>
+  <string name="incall_video_call_requesting">Videohovory prostredníctvom operátora…</string>
+  <string name="incall_wifi_video_call_requesting">Videohovory cez Wi-Fi prostredníctvom operátora…</string>
+  <string name="incall_video_call_upgrade_request">Prepína sa na videohovor prostredníctvom operátora…</string>
+  <string name="incall_video_call_request_failed">Pripojenie nie je možné</string>
+  <string name="incall_video_call_request_rejected">Hovor bol odmietnutý</string>
+  <string name="incall_video_call_request_timed_out">Časový limit hovoru uplynul</string>
+  <string name="incall_hanging_up">Ukončuje sa hovor</string>
+  <string name="incall_call_ended">Hovor bol ukončený</string>
+  <string name="incall_remotely_held">Podržané</string>
+  <string name="contact_grid_incoming_video_call">Videohovor prostredníctvom operátora od</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videohovor cez Wi-Fi prostredníctvom operátora od</string>
+  <string name="contact_grid_incoming_voice_call">Hovor od:</string>
+  <string name="contact_grid_incoming_work_call">Pracovný hovor od:</string>
+  <string name="contact_grid_incoming_via_template">Prichádzajúci hovor prostredníctvom poskytovateľa %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Podozrenie na spam</string>
+  <string name="contact_grid_callback_number">Číslo tohto telefónu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
index 390a10252..c42cc8264 100644
--- a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Klicanje prek ponudnika <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Klicanje …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenašanje ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezave ni mogoče vzpostaviti"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Klic je bil zavrnjen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Časovna omejitev klica je potekla"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekinitev"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Klic je bil končan"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Zadržano"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Klic osebe"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Delovni klic osebe"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dohodni klic prek storitve <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Neželeni klicatelj"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Številka za povratni klic: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Klicanje prek ponudnika %s</string>
+  <string name="incall_calling_on_same_carrier_template">Klicanje prek istega operaterja %s</string>
+  <string name="incall_calling_on_recent_choice_template">Klicanje glede na nedavno izbiro %s</string>
+  <string name="incall_connecting">Klicanje …</string>
+  <string name="incall_connecting_assited_dialed">Klicanje prek +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Uporabljeno +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Prenašanje ...</string>
+  <string name="incall_video_call_requesting">Videoklicanje prek operaterja …</string>
+  <string name="incall_wifi_video_call_requesting">Videoklicanje prek Wi-Fi-ja operaterja …</string>
+  <string name="incall_video_call_upgrade_request">Preklapljanje na videoklic prek operaterja …</string>
+  <string name="incall_video_call_request_failed">Povezave ni mogoče vzpostaviti</string>
+  <string name="incall_video_call_request_rejected">Klic je bil zavrnjen</string>
+  <string name="incall_video_call_request_timed_out">Časovna omejitev klica je potekla</string>
+  <string name="incall_hanging_up">Prekinitev</string>
+  <string name="incall_call_ended">Klic je bil končan</string>
+  <string name="incall_remotely_held">Zadržano</string>
+  <string name="contact_grid_incoming_video_call">Videoklic prek operaterja osebe</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videoklic prek Wi-Fi-ja operaterja osebe</string>
+  <string name="contact_grid_incoming_voice_call">Klic osebe</string>
+  <string name="contact_grid_incoming_work_call">Delovni klic osebe</string>
+  <string name="contact_grid_incoming_via_template">Dohodni klic prek storitve %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Neželeni klicatelj</string>
+  <string name="contact_grid_callback_number">Številka tega telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
index e2ed11d0a..3b5a921fa 100644
--- a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Telefonatë nëpërmjet <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Po telefonon…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Po transferon..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nuk mund të lidhet"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Telefonata u refuzua"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Telefonatës i mbaroi koha"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Po mbyllet"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Telefonata përfundoi"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Në pritje"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Telefonatë nga"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Telefonatë pune nga"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Telefonatë hyrëse nëpërmjet <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Telefonues i dyshuar si i padëshiruar"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numri i kthimit të telefonatës: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Telefonatë nëpërmjet %s</string>
+  <string name="incall_calling_on_same_carrier_template">Po telefonon me të njëjtin operator celular %s</string>
+  <string name="incall_calling_on_recent_choice_template">Po telefonon me zgjedhjen e fundit %s</string>
+  <string name="incall_connecting">Po telefonon…</string>
+  <string name="incall_connecting_assited_dialed">Po telefonon me +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Po përdor +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Po transferon...</string>
+  <string name="incall_video_call_requesting">Telefonatë me video e operatorit celular...</string>
+  <string name="incall_wifi_video_call_requesting">Telefonatë me video me Wi-Fi e operatorit celular…</string>
+  <string name="incall_video_call_upgrade_request">Po kalon te videoja e operatorit celular…</string>
+  <string name="incall_video_call_request_failed">Nuk mund të lidhet</string>
+  <string name="incall_video_call_request_rejected">Telefonata u refuzua</string>
+  <string name="incall_video_call_request_timed_out">Telefonatës i mbaroi koha</string>
+  <string name="incall_hanging_up">Po mbyllet</string>
+  <string name="incall_call_ended">Telefonata përfundoi</string>
+  <string name="incall_remotely_held">Në pritje</string>
+  <string name="contact_grid_incoming_video_call">Telefonatë me video e operatorit celular nga</string>
+  <string name="contact_grid_incoming_wifi_video_call">Telefonatë me video me Wi-Fi e operatorit celular nga</string>
+  <string name="contact_grid_incoming_voice_call">Telefonatë nga</string>
+  <string name="contact_grid_incoming_work_call">Telefonatë pune nga</string>
+  <string name="contact_grid_incoming_via_template">Telefonatë hyrëse nëpërmjet %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Telefonues i dyshuar si i padëshiruar</string>
+  <string name="contact_grid_callback_number">Numri i këtij telefoni: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
index fe59a3047..6d321f808 100644
--- a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Позивамо преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Позивамо…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Преносимо…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Повезивање није успело"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Позив је одбијен"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Временско ограничење позива је истекло"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Прекидамо везу"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Позив је завршен"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На чекању"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Позив од"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Пословни позив од"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Долазни позив преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Потенцијално непожељан позивалац"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Број за повратни позив: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Позивамо преко %s</string>
+  <string name="incall_calling_on_same_carrier_template">Позива се преко истог мобилног оператера: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Позива се на основу недавног избора преко: %s</string>
+  <string name="incall_connecting">Позивамо…</string>
+  <string name="incall_connecting_assited_dialed">Позива се са +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Користи се +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Преносимо…</string>
+  <string name="incall_video_call_requesting">Упућује се видео позив преко оператера…</string>
+  <string name="incall_wifi_video_call_requesting">Пребацује се на Wi-Fi видео позив преко оператера…</string>
+  <string name="incall_video_call_upgrade_request">Пребацује се на видео позив преко оператера…</string>
+  <string name="incall_video_call_request_failed">Повезивање није успело</string>
+  <string name="incall_video_call_request_rejected">Позив је одбијен</string>
+  <string name="incall_video_call_request_timed_out">Временско ограничење позива је истекло</string>
+  <string name="incall_hanging_up">Прекидамо везу</string>
+  <string name="incall_call_ended">Позив је завршен</string>
+  <string name="incall_remotely_held">На чекању</string>
+  <string name="contact_grid_incoming_video_call">Видео позив преко оператера од:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi видео позив преко оператера од:</string>
+  <string name="contact_grid_incoming_voice_call">Позив од</string>
+  <string name="contact_grid_incoming_work_call">Пословни позив од</string>
+  <string name="contact_grid_incoming_via_template">Долазни позив преко %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Потенцијално непожељан позивалац</string>
+  <string name="contact_grid_callback_number">Број овог телефона: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
index 61bb7d1e7..9f6297e96 100644
--- a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ringer med <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer upp …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Överför …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Det går inte att ansluta"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Samtalet avvisat"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Samtalets tidsgräns nådd"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lägger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Samtal avslutat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Parkerat"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Samtal från"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbsamtal från"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkommande via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Misstänkt spamsamtal"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Motringningsnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer med %s</string>
+  <string name="incall_calling_on_same_carrier_template">Ringer via samma operatör %s</string>
+  <string name="incall_calling_on_recent_choice_template">Ringer via senaste val %s</string>
+  <string name="incall_connecting">Ringer upp …</string>
+  <string name="incall_connecting_assited_dialed">Ringer med +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Med +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Överför …</string>
+  <string name="incall_video_call_requesting">Videosamtal med operatören …</string>
+  <string name="incall_wifi_video_call_requesting">Videosamtal med Wi-Fi-operatören …</string>
+  <string name="incall_video_call_upgrade_request">Växlar till operatörsvideo …</string>
+  <string name="incall_video_call_request_failed">Det går inte att ansluta</string>
+  <string name="incall_video_call_request_rejected">Samtalet avvisat</string>
+  <string name="incall_video_call_request_timed_out">Samtalets tidsgräns nådd</string>
+  <string name="incall_hanging_up">Lägger på</string>
+  <string name="incall_call_ended">Samtal avslutat</string>
+  <string name="incall_remotely_held">Parkerat</string>
+  <string name="contact_grid_incoming_video_call">Operatörsvideosamtal från</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-operatörsvideosamtal från</string>
+  <string name="contact_grid_incoming_voice_call">Samtal från</string>
+  <string name="contact_grid_incoming_work_call">Jobbsamtal från</string>
+  <string name="contact_grid_incoming_via_template">Inkommande via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Misstänkt spamsamtal</string>
+  <string name="contact_grid_callback_number">Telefonens nummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
index 43e4b91ba..3b944a9fb 100644
--- a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Inapiga simu kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Inapiga simu…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Inahamisha…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Imeshindwa kuunganisha"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Simu imekataliwa"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Muda wa kuanza upigaji simu umekwisha"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Inakata simu"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Simu imekamilika"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Imesitishwa"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Simu kutoka kwa"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Simu ya kazi kutoka kwa"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Simu zinazoingia kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Anayeshukiwa kupiga simu taka"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nambari yako ya kupigiwa simu: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Inapiga simu kupitia %s</string>
+  <string name="incall_calling_on_same_carrier_template">Inapiga kwa kutumia mtandao wa mtoa huduma yule yule %s</string>
+  <string name="incall_calling_on_recent_choice_template">Inapiga kwa kutumia mtandao wa mtoa huduma wa hivi karibuni %s</string>
+  <string name="incall_connecting">Inapiga simu…</string>
+  <string name="incall_connecting_assited_dialed">Kupiga simu kwa kutumia +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Kwa kutumia +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Inahamisha…</string>
+  <string name="incall_video_call_requesting">Unapiga simu ya video kupitia kampuni ya simu…</string>
+  <string name="incall_wifi_video_call_requesting">Unapiga simu ya video kupitia Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Inabadilisha kwenda kwenye simu ya video…</string>
+  <string name="incall_video_call_request_failed">Imeshindwa kuunganisha</string>
+  <string name="incall_video_call_request_rejected">Simu imekataliwa</string>
+  <string name="incall_video_call_request_timed_out">Muda wa kuanza upigaji simu umekwisha</string>
+  <string name="incall_hanging_up">Inakata simu</string>
+  <string name="incall_call_ended">Simu imekamilika</string>
+  <string name="incall_remotely_held">Imesitishwa</string>
+  <string name="contact_grid_incoming_video_call">Simu ya video kutoka</string>
+  <string name="contact_grid_incoming_wifi_video_call">Simu ya video kupitia Wi-Fi kutoka</string>
+  <string name="contact_grid_incoming_voice_call">Simu kutoka kwa</string>
+  <string name="contact_grid_incoming_work_call">Simu ya kazi kutoka kwa</string>
+  <string name="contact_grid_incoming_via_template">Simu zinazoingia kupitia %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Anayeshukiwa kupiga simu taka</string>
+  <string name="contact_grid_callback_number">Nambari ya simu hii: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
index b9b90d9af..f00afadbd 100644
--- a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> வழியாக அழைக்கிறது"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"அழைக்கிறது…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"இடமாற்றுகிறது…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"இணைக்க முடியவில்லை"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"அழைப்பு நிராகரிக்கப்பட்டது"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"அழைப்பின் நேரம் முடிந்தது"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"துண்டிக்கிறது"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"அழைப்பு முடிந்தது"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ஹோல்டில் உள்ளது"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"அழைப்பு:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"அழைப்பு (பணி) :"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் உள்வரும் அழைப்பு"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர்"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"திரும்ப அழைப்பதற்கான எண்: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s வழியாக அழைக்கிறது</string>
+  <string name="incall_calling_on_same_carrier_template">%s (அதே தொலைத்தொடர்பு நிறுவனம்) இல் அழைக்கிறது</string>
+  <string name="incall_calling_on_recent_choice_template">%s (சமீபத்தில் தேர்வுசெய்த கேரியர்) இல் அழைக்கிறது</string>
+  <string name="incall_connecting">அழைக்கிறது…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s)ஐப் பயன்படுத்தி அழைக்கிறது…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) என்ற நாட்டின் குறியீட்டைப் பயன்படுத்துகிறது…</string>
+  <string name="incall_transferring">இடமாற்றுகிறது…</string>
+  <string name="incall_video_call_requesting">தொலைத்தொடர்பு நிறுவன வீடியோ அழைப்பு…</string>
+  <string name="incall_wifi_video_call_requesting">வைஃபையில் தொலைத்தொடர்பு வீடியோ அழைப்பு…</string>
+  <string name="incall_video_call_upgrade_request">தொலைத்தொடர்பு நிறுவன வீடியோவிற்கு மாறுகிறது…</string>
+  <string name="incall_video_call_request_failed">இணைக்க முடியவில்லை</string>
+  <string name="incall_video_call_request_rejected">அழைப்பு நிராகரிக்கப்பட்டது</string>
+  <string name="incall_video_call_request_timed_out">அழைப்பின் நேரம் முடிந்தது</string>
+  <string name="incall_hanging_up">துண்டிக்கிறது</string>
+  <string name="incall_call_ended">அழைப்பு முடிந்தது</string>
+  <string name="incall_remotely_held">ஹோல்டில் உள்ளது</string>
+  <string name="contact_grid_incoming_video_call">இவரிடமிருந்து தொலைத்தொடர்பு நிறுவன வீடியோ அழைப்பு</string>
+  <string name="contact_grid_incoming_wifi_video_call">இவரிடமிருந்து வைஃபையில் தொலைத்தொடர்பு வீடியோ அழைப்பு</string>
+  <string name="contact_grid_incoming_voice_call">அழைப்பு:</string>
+  <string name="contact_grid_incoming_work_call">அழைப்பு (பணி) :</string>
+  <string name="contact_grid_incoming_via_template">%s மூலம் உள்வரும் அழைப்பு</string>
+  <string name="contact_grid_incoming_suspected_spam">சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர்</string>
+  <string name="contact_grid_callback_number">இந்த ஃபோனின் எண்: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-te/strings.xml b/java/com/android/incallui/contactgrid/res/values-te/strings.xml
index efceca414..258f5fd17 100644
--- a/java/com/android/incallui/contactgrid/res/values-te/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-te/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా కాల్ చేస్తోంది"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"కాల్ చేస్తోంది…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"బదిలీ చేస్తోంది…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"కనెక్ట్ చేయలేకపోయింది"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"కాల్ తిరస్కరించబడింది"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"కాల్ సమయాభావం అయింది"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"కాల్ ముగిస్తోంది"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"కాల్ ముగిసింది"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"హోల్డ్‌లో ఉంది"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"వీరి నుండి కాల్:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"వీరి నుండి కార్యాలయ కాల్:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా ఇన్‌కమింగ్ కాల్"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"అనుమానాస్పద స్పామ్ కాలర్"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"కాల్‌బ్యాక్ నంబర్: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s ద్వారా కాల్ చేస్తోంది</string>
+  <string name="incall_calling_on_same_carrier_template">అదే క్యారియర్ %sలో కాల్ చేస్తోంది</string>
+  <string name="incall_calling_on_recent_choice_template">ఇటీవలి ఎంపిక %sలో కాల్ చేస్తోంది</string>
+  <string name="incall_connecting">కాల్ చేస్తోంది…</string>
+  <string name="incall_connecting_assited_dialed">+%1$sని (%2$s) ఉపయోగించి కాల్ చేస్తోంది…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ఉపయోగించి…</string>
+  <string name="incall_transferring">బదిలీ చేస్తోంది…</string>
+  <string name="incall_video_call_requesting">క్యారియర్ వీడియో కాలింగ్...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi క్యారియర్ వీడియో కాలింగ్...</string>
+  <string name="incall_video_call_upgrade_request">క్యారియర్ వీడియోకి మారుతోంది...</string>
+  <string name="incall_video_call_request_failed">కనెక్ట్ చేయలేకపోయింది</string>
+  <string name="incall_video_call_request_rejected">కాల్ తిరస్కరించబడింది</string>
+  <string name="incall_video_call_request_timed_out">కాల్ సమయాభావం అయింది</string>
+  <string name="incall_hanging_up">కాల్ ముగిస్తోంది</string>
+  <string name="incall_call_ended">కాల్ ముగిసింది</string>
+  <string name="incall_remotely_held">హోల్డ్‌లో ఉంది</string>
+  <string name="contact_grid_incoming_video_call">వీరి నుండి క్యారియర్ వీడియో కాల్</string>
+  <string name="contact_grid_incoming_wifi_video_call">వీరి నుండి Wi-Fi క్యారియర్ వీడియో కాల్</string>
+  <string name="contact_grid_incoming_voice_call">వీరి నుండి కాల్:</string>
+  <string name="contact_grid_incoming_work_call">వీరి నుండి కార్యాలయ కాల్:</string>
+  <string name="contact_grid_incoming_via_template">%s ద్వారా ఇన్‌కమింగ్ కాల్</string>
+  <string name="contact_grid_incoming_suspected_spam">అనుమానాస్పద స్పామ్ కాలర్</string>
+  <string name="contact_grid_callback_number">ఈ ఫోన్ నంబర్: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-th/strings.xml b/java/com/android/incallui/contactgrid/res/values-th/strings.xml
index 26bad5160..4c366f402 100644
--- a/java/com/android/incallui/contactgrid/res/values-th/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-th/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"โทรผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"กำลังโทร…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"กำลังโอน…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ไม่สามารถเชื่อมต่อ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"สายถูกปฏิเสธ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ไม่มีผู้รับสาย"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"กำลังวางสาย"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"วางสายแล้ว"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"พักสาย"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"โทรจาก"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"โทรเรื่องงานจาก"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"สายเรียกเข้าผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ผู้โทรที่สงสัยว่าเป็นสแปม"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"หมายเลขโทรกลับ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">โทรผ่าน %s</string>
+  <string name="incall_calling_on_same_carrier_template">กำลังโทรโดยใช้ผู้ให้บริการเดียวกัน%s</string>
+  <string name="incall_calling_on_recent_choice_template">กำลังโทรโดยใช้ตัวเลือกล่าสุด%s</string>
+  <string name="incall_connecting">กำลังโทร…</string>
+  <string name="incall_connecting_assited_dialed">โทรด้วย +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">กำลังใช้ +%1$s (%2$s)…</string>
+  <string name="incall_transferring">กำลังโอน…</string>
+  <string name="incall_video_call_requesting">กำลังโทรวิดีโอคอลผ่านผู้ให้บริการ...</string>
+  <string name="incall_wifi_video_call_requesting">กำลังโทรวิดีโอคอลผ่านผู้ให้บริการ Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">กำลังเปลี่ยนไปเป็นวิดีโอคอลผ่านผู้ให้บริการ…</string>
+  <string name="incall_video_call_request_failed">ไม่สามารถเชื่อมต่อ</string>
+  <string name="incall_video_call_request_rejected">สายถูกปฏิเสธ</string>
+  <string name="incall_video_call_request_timed_out">ไม่มีผู้รับสาย</string>
+  <string name="incall_hanging_up">กำลังวางสาย</string>
+  <string name="incall_call_ended">วางสายแล้ว</string>
+  <string name="incall_remotely_held">พักสาย</string>
+  <string name="contact_grid_incoming_video_call">วิดีโอคอลผ่านผู้ให้บริการจาก</string>
+  <string name="contact_grid_incoming_wifi_video_call">วิดีโอคอลผ่านผู้ให้บริการ Wi-Fi จาก</string>
+  <string name="contact_grid_incoming_voice_call">โทรจาก</string>
+  <string name="contact_grid_incoming_work_call">โทรเรื่องงานจาก</string>
+  <string name="contact_grid_incoming_via_template">สายเรียกเข้าผ่าน %s</string>
+  <string name="contact_grid_incoming_suspected_spam">ผู้โทรที่สงสัยว่าเป็นสแปม</string>
+  <string name="contact_grid_callback_number">หมายเลขโทรศัพท์นี้: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
index a80b72e81..120ab7848 100644
--- a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Tumatawag sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Tinatawagan…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Inililipat…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Hindi nakakonekta"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Tinanggihan ang tawag"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Nag-time out ang tawag"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Binababa"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Natapos ang tawag"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Naka-hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Tawag mula kay"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Tawag sa trabaho mula kay"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Papasok sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Pinaghihinalaang spam na tumatawag"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numero upang matawagang muli: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Tumatawag sa pamamagitan ng %s</string>
+  <string name="incall_calling_on_same_carrier_template">Tumatawag sa parehong carrier na %s</string>
+  <string name="incall_calling_on_recent_choice_template">Tumatawag sa kamakailang pinili na %s</string>
+  <string name="incall_connecting">Tinatawagan…</string>
+  <string name="incall_connecting_assited_dialed">Tumatawag gamit ang +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Ginagamit ang +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Inililipat…</string>
+  <string name="incall_video_call_requesting">Pakikipag-video call gamit ang carrier…</string>
+  <string name="incall_wifi_video_call_requesting">Pakikipag-video call gamit ang Wi-Fi carrier…</string>
+  <string name="incall_video_call_upgrade_request">Lumilipat sa video ng carrier…</string>
+  <string name="incall_video_call_request_failed">Hindi nakakonekta</string>
+  <string name="incall_video_call_request_rejected">Tinanggihan ang tawag</string>
+  <string name="incall_video_call_request_timed_out">Nag-time out ang tawag</string>
+  <string name="incall_hanging_up">Binababa</string>
+  <string name="incall_call_ended">Natapos ang tawag</string>
+  <string name="incall_remotely_held">Naka-hold</string>
+  <string name="contact_grid_incoming_video_call">Video call sa carrier mula kay</string>
+  <string name="contact_grid_incoming_wifi_video_call">Video call sa Wi-Fi carrier mula kay</string>
+  <string name="contact_grid_incoming_voice_call">Tawag mula kay</string>
+  <string name="contact_grid_incoming_work_call">Tawag sa trabaho mula kay</string>
+  <string name="contact_grid_incoming_via_template">Papasok sa pamamagitan ng %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Pinaghihinalaang spam na tumatawag</string>
+  <string name="contact_grid_callback_number">Numero ng teleponong ito: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
index 98646be77..b68196942 100644
--- a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzerinden çağrı yapılıyor"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Çağrı yapılıyor…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Aktarılıyor…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Bağlantı kurulamadı"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Çağrı reddedildi"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Çağrı zaman aşımına uğradı"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Çağrı sonlandırılıyor"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Çağrı sonlandırıldı"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Beklemede"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Gelen çağrı:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Gelen iş çağrısı:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> adlı sağlayıcı üzerinden gelen çağrı"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Spam olduğundan şüphelenilen arayan"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Geri arama numarası: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s üzerinden çağrı yapılıyor</string>
+  <string name="incall_calling_on_same_carrier_template">Aynı operatör (%s) üzerinden aranıyor</string>
+  <string name="incall_calling_on_recent_choice_template">Son yapılan seçim (%s) üzerinden aranıyor</string>
+  <string name="incall_connecting">Çağrı yapılıyor…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) kullanılarak telefon ediliyor…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) kullanılıyor…</string>
+  <string name="incall_transferring">Aktarılıyor…</string>
+  <string name="incall_video_call_requesting">Operatör üzerinden görüntülü görüşme…</string>
+  <string name="incall_wifi_video_call_requesting">Operatör üzerinden kablosuz görüntülü görüşme…</string>
+  <string name="incall_video_call_upgrade_request">Operatör üzerinden görüntülü görüşmeye geçiliyor…</string>
+  <string name="incall_video_call_request_failed">Bağlantı kurulamadı</string>
+  <string name="incall_video_call_request_rejected">Çağrı reddedildi</string>
+  <string name="incall_video_call_request_timed_out">Çağrı zaman aşımına uğradı</string>
+  <string name="incall_hanging_up">Çağrı sonlandırılıyor</string>
+  <string name="incall_call_ended">Çağrı sonlandırıldı</string>
+  <string name="incall_remotely_held">Beklemede</string>
+  <string name="contact_grid_incoming_video_call">Operatör üzerinden görüntülü görüşme isteği:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Operatör üzerinden kablosuz görüntülü görüşme isteği:</string>
+  <string name="contact_grid_incoming_voice_call">Gelen çağrı:</string>
+  <string name="contact_grid_incoming_work_call">Gelen iş çağrısı:</string>
+  <string name="contact_grid_incoming_via_template">%s adlı sağlayıcı üzerinden gelen çağrı</string>
+  <string name="contact_grid_incoming_suspected_spam">Spam olduğundan şüphelenilen arayan</string>
+  <string name="contact_grid_callback_number">Bu telefonun numarası: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
index 90379014a..e14ffd92d 100644
--- a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Виклик здійснюється через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Виклик…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Пересилання…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не вдалося під’єднатися"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Виклик відхилено"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Час очікування виклику минув"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Завершення виклику"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Виклик завершено"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Утримується"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Виклик від:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Виклик на робочий телефон від:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Вхідні виклики через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Підозрілий абонент"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Номер зворотного виклику: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Виклик здійснюється через оператора %s</string>
+  <string name="incall_calling_on_same_carrier_template">Використовується той самий оператор, що й в абонента: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Вибрано нещодавній варіант: %s</string>
+  <string name="incall_connecting">Виклик…</string>
+  <string name="incall_connecting_assited_dialed">Виклик за допомогою коду +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Використовується формат +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Пересилання…</string>
+  <string name="incall_video_call_requesting">Відеодзвінок у мережі оператора…</string>
+  <string name="incall_wifi_video_call_requesting">Відеодзвінок у мережі Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Переведення відеодзвінка в мережу оператора…</string>
+  <string name="incall_video_call_request_failed">Не вдалося під’єднатися</string>
+  <string name="incall_video_call_request_rejected">Виклик відхилено</string>
+  <string name="incall_video_call_request_timed_out">Час очікування виклику минув</string>
+  <string name="incall_hanging_up">Завершення виклику</string>
+  <string name="incall_call_ended">Виклик завершено</string>
+  <string name="incall_remotely_held">Утримується</string>
+  <string name="contact_grid_incoming_video_call">Відеодзвінок у мережі оператора, телефонує</string>
+  <string name="contact_grid_incoming_wifi_video_call">Відеодзвінок у мережі Wi-Fi, телефонує</string>
+  <string name="contact_grid_incoming_voice_call">Виклик від:</string>
+  <string name="contact_grid_incoming_work_call">Виклик на робочий телефон від:</string>
+  <string name="contact_grid_incoming_via_template">Вхідні виклики через оператора %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Підозрілий абонент</string>
+  <string name="contact_grid_callback_number">Номер цього телефону: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
index 3021e237e..eef895c1a 100644
--- a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"کالنگ بذریعہ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"کال کی جا رہی ہے…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"منتقل ہو رہی ہے…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"منسلک ہونے سے قاصر"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"کال مسترد ہوگئی"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"کال کا وقت ختم ہوگیا"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"کال منقطع ہو رہی ہے"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"کال ختم ہوگئی"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ہولڈ پر ہے"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"کال منجانب"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"دفتری کال منجانب"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> کے ذریعے آنے والی کال"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"مشتبہ سپام کالر"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"کال بیک نمبر: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">کالنگ بذریعہ %s</string>
+  <string name="incall_calling_on_same_carrier_template">ایک ہی کیریئر %s کے ذریعے کال کی جا رہی ہے</string>
+  <string name="incall_calling_on_recent_choice_template">حالیہ انتخاب %s کے ذریعے کال کی جا رہی ہے</string>
+  <string name="incall_connecting">کال کی جا رہی ہے…</string>
+  <string name="incall_connecting_assited_dialed">‏‎‎+%1$s‎ (%2$s) کا استعمال کر کے کال کی جا رہی ہے…</string>
+  <string name="incall_connecting_assited_dialed_component">%1$s+ (%2$s) کے ذریعے…</string>
+  <string name="incall_transferring">منتقل ہو رہی ہے…</string>
+  <string name="incall_video_call_requesting">کیرئیر ویڈیو کالنگ…</string>
+  <string name="incall_wifi_video_call_requesting">‏Wi-Fi کیرئیر ویڈیو کالنگ…</string>
+  <string name="incall_video_call_upgrade_request">کیریئر ویڈیو پر سوئچ ہو رہا ہے…</string>
+  <string name="incall_video_call_request_failed">منسلک ہونے سے قاصر</string>
+  <string name="incall_video_call_request_rejected">کال مسترد ہوگئی</string>
+  <string name="incall_video_call_request_timed_out">کال کا وقت ختم ہوگیا</string>
+  <string name="incall_hanging_up">کال منقطع ہو رہی ہے</string>
+  <string name="incall_call_ended">کال ختم ہوگئی</string>
+  <string name="incall_remotely_held">ہولڈ پر ہے</string>
+  <string name="contact_grid_incoming_video_call">کیریئر ویڈیو کال منجانب</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏Wi-Fi کیریئر ویڈیو کال منجانب</string>
+  <string name="contact_grid_incoming_voice_call">کال منجانب</string>
+  <string name="contact_grid_incoming_work_call">دفتری کال منجانب</string>
+  <string name="contact_grid_incoming_via_template">%s کے ذریعے آنے والی کال</string>
+  <string name="contact_grid_incoming_suspected_spam">مشتبہ سپام کالر</string>
+  <string name="contact_grid_callback_number">اس فون کا نمبر: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
index df85c78ed..c50aa0296 100644
--- a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chaqiruv…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"O‘tkazilmoqda…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Bog‘lanib bo‘lmadi"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Qo‘ng‘iroq rad etildi"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Qo‘ng‘iroqning kutish vaqti tugadi"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Chaqiruv tugatilmoqda"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chaqiruv tugatildi"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Kutish rejimida"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chaqiruv:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ish telefoniga kimdan qo‘ng‘iroq:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Kiruvchi chaqiruv (operator: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Shubhali abonent"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Teskari qo‘ng‘iroq uchun raqam: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s orqali qo‘ng‘rioq qilinmoqda</string>
+  <string name="incall_calling_on_same_carrier_template">Shu aloqa operatori – %s orqali chaqiruv</string>
+  <string name="incall_calling_on_recent_choice_template">Yaqinda tanlangan aloqa operatori – %s orqali chaqiruv</string>
+  <string name="incall_connecting">Chaqiruv…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s kodi orqali chaqirilmoqda (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) kodi ishlatilmoqda…</string>
+  <string name="incall_transferring">O‘tkazilmoqda…</string>
+  <string name="incall_video_call_requesting">Video chaqiruv…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi orqali video chaqiruv…</string>
+  <string name="incall_video_call_upgrade_request">Video chaqiruvga o‘tkazilmoqda…</string>
+  <string name="incall_video_call_request_failed">Bog‘lanib bo‘lmadi</string>
+  <string name="incall_video_call_request_rejected">Qo‘ng‘iroq rad etildi</string>
+  <string name="incall_video_call_request_timed_out">Qo‘ng‘iroqning kutish vaqti tugadi</string>
+  <string name="incall_hanging_up">Chaqiruv tugatilmoqda</string>
+  <string name="incall_call_ended">Chaqiruv tugatildi</string>
+  <string name="incall_remotely_held">Kutish rejimida</string>
+  <string name="contact_grid_incoming_video_call">Video chaqiruv:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi orqali video chaqiruv:</string>
+  <string name="contact_grid_incoming_voice_call">Chaqiruv:</string>
+  <string name="contact_grid_incoming_work_call">Ish telefoniga kimdan qo‘ng‘iroq:</string>
+  <string name="contact_grid_incoming_via_template">Kiruvchi chaqiruv (operator: %s)</string>
+  <string name="contact_grid_incoming_suspected_spam">Shubhali abonent</string>
+  <string name="contact_grid_callback_number">Bu telefonning raqami: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
index abed7b079..ac6acd189 100644
--- a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Đang gọi điện qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Đang gọi…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Đang chuyển…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Không thể kết nối"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Cuộc gọi bị từ chối"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Cuộc gọi đã hết giờ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Đang kết thúc cuộc gọi"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Cuộc gọi đã kết thúc"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Đang chờ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Cuộc gọi từ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Cuộc gọi về công việc từ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Cuộc gọi đến qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Người gọi điện spam đáng ngờ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Số điện thoại gọi lại: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Đang gọi điện qua %s</string>
+  <string name="incall_calling_on_same_carrier_template">Đang gọi qua cùng một nhà mạng %s</string>
+  <string name="incall_calling_on_recent_choice_template">Đang gọi qua nhà mạng được chọn gần đây %s</string>
+  <string name="incall_connecting">Đang gọi…</string>
+  <string name="incall_connecting_assited_dialed">Đang gọi bằng +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Đang sử dụng +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Đang chuyển…</string>
+  <string name="incall_video_call_requesting">Đang gọi điện video qua mạng dữ liệu di động…</string>
+  <string name="incall_wifi_video_call_requesting">Đang gọi điện video qua Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Đang chuyển sang cuộc gọi video qua mạng dữ liệu di động…</string>
+  <string name="incall_video_call_request_failed">Không thể kết nối</string>
+  <string name="incall_video_call_request_rejected">Cuộc gọi bị từ chối</string>
+  <string name="incall_video_call_request_timed_out">Cuộc gọi đã hết giờ</string>
+  <string name="incall_hanging_up">Đang kết thúc cuộc gọi</string>
+  <string name="incall_call_ended">Cuộc gọi đã kết thúc</string>
+  <string name="incall_remotely_held">Đang chờ</string>
+  <string name="contact_grid_incoming_video_call">Cuộc gọi video qua mạng dữ liệu di động từ</string>
+  <string name="contact_grid_incoming_wifi_video_call">Cuộc gọi video qua Wi-Fi từ</string>
+  <string name="contact_grid_incoming_voice_call">Cuộc gọi từ</string>
+  <string name="contact_grid_incoming_work_call">Cuộc gọi về công việc từ</string>
+  <string name="contact_grid_incoming_via_template">Cuộc gọi đến qua %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Người gọi điện spam đáng ngờ</string>
+  <string name="contact_grid_callback_number">Số điện thoại này là: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
index 6aaa94ce8..b71c833c8 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"正在通过<xliff:g id="PROVIDER_NAME">%s</xliff:g>进行通话"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"正在呼叫…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"正在转接…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"无法连接"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通话被拒绝"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通话超时"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"正在挂断"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通话结束"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保持"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"通话来自："</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"工作通话来自："</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"有人通过 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 来电"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"疑似骚扰电话号码："</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"回拨号码：<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">正在通过%s进行通话</string>
+  <string name="incall_calling_on_same_carrier_template">正在通过相同的运营商%s拨号</string>
+  <string name="incall_calling_on_recent_choice_template">正在通过最近选择的运营商%s拨号</string>
+  <string name="incall_connecting">正在呼叫…</string>
+  <string name="incall_connecting_assited_dialed">正在使用 +%1$s (%2$s) 拨打电话…</string>
+  <string name="incall_connecting_assited_dialed_component">正在使用 +%1$s (%2$s)…</string>
+  <string name="incall_transferring">正在转接…</string>
+  <string name="incall_video_call_requesting">正在进行运营商视频通话…</string>
+  <string name="incall_wifi_video_call_requesting">正在进行 WLAN 运营商视频通话…</string>
+  <string name="incall_video_call_upgrade_request">正在切换到运营商视频通话…</string>
+  <string name="incall_video_call_request_failed">无法连接</string>
+  <string name="incall_video_call_request_rejected">通话被拒绝</string>
+  <string name="incall_video_call_request_timed_out">通话超时</string>
+  <string name="incall_hanging_up">正在挂断</string>
+  <string name="incall_call_ended">通话结束</string>
+  <string name="incall_remotely_held">保持</string>
+  <string name="contact_grid_incoming_video_call">运营商视频通话来电：</string>
+  <string name="contact_grid_incoming_wifi_video_call">WLAN 运营商视频通话来电：</string>
+  <string name="contact_grid_incoming_voice_call">通话来自：</string>
+  <string name="contact_grid_incoming_work_call">工作通话来自：</string>
+  <string name="contact_grid_incoming_via_template">有人通过 %s 来电</string>
+  <string name="contact_grid_incoming_suspected_spam">疑似骚扰电话号码：</string>
+  <string name="contact_grid_callback_number">此手机的号码：%1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
index 82a920e94..1d6f9022b 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"撥號中…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"正在轉駁…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"無法連線"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通話被拒"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通話逾時"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"正在掛斷電話"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通話已結束"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保留"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"通話來自"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"工作通話來自"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 的來電"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"疑似垃圾來電者"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"回電號碼：<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">正在透過 %s 撥號</string>
+  <string name="incall_calling_on_same_carrier_template">正在透過同一個流動網絡供應商「%s」撥打電話</string>
+  <string name="incall_calling_on_recent_choice_template">正在透過最近所選的「%s」撥打電話</string>
+  <string name="incall_connecting">撥號中…</string>
+  <string name="incall_connecting_assited_dialed">正在使用 +%1$s (%2$s) 撥打電話…</string>
+  <string name="incall_connecting_assited_dialed_component">正在使用 +%1$s (%2$s)…</string>
+  <string name="incall_transferring">正在轉駁…</string>
+  <string name="incall_video_call_requesting">正在進行流動網絡供應商視像通話…</string>
+  <string name="incall_wifi_video_call_requesting">正在進行 Wi-Fi 流動網絡供應商視像通話…</string>
+  <string name="incall_video_call_upgrade_request">正在切換至流動網絡供應商視像…</string>
+  <string name="incall_video_call_request_failed">無法連線</string>
+  <string name="incall_video_call_request_rejected">通話被拒</string>
+  <string name="incall_video_call_request_timed_out">通話逾時</string>
+  <string name="incall_hanging_up">正在掛斷電話</string>
+  <string name="incall_call_ended">通話已結束</string>
+  <string name="incall_remotely_held">保留</string>
+  <string name="contact_grid_incoming_video_call">流動網絡供應商視像通話撥入者</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi 流動網絡供應商視像通話撥入者</string>
+  <string name="contact_grid_incoming_voice_call">通話來自</string>
+  <string name="contact_grid_incoming_work_call">工作通話來自</string>
+  <string name="contact_grid_incoming_via_template">透過 %s 的來電</string>
+  <string name="contact_grid_incoming_suspected_spam">疑似垃圾來電者</string>
+  <string name="contact_grid_callback_number">這部手機的號碼：%1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
index b1b32fa13..d3737493f 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"撥號中…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"轉接中..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"無法連線"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通話遭到拒絕"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通話要求逾時"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"掛斷中"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通話已結束"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保留中"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"語音來電："</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"公司來電："</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"有人透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 來電"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"可疑的騷擾/廣告來電者"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"回撥號碼：<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">正在透過 %s 撥號</string>
+  <string name="incall_calling_on_same_carrier_template">正在透過相同的電信業者 (%s) 撥號</string>
+  <string name="incall_calling_on_recent_choice_template">正在透過最近所選的電信業者 (%s) 撥號</string>
+  <string name="incall_connecting">撥號中…</string>
+  <string name="incall_connecting_assited_dialed">正在撥號至 +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">正在使用 +%1$s (%2$s)…</string>
+  <string name="incall_transferring">轉接中...</string>
+  <string name="incall_video_call_requesting">電信業者視訊通話…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi 電信業者視訊通話…</string>
+  <string name="incall_video_call_upgrade_request">正在切換至電信業者視訊通話…</string>
+  <string name="incall_video_call_request_failed">無法連線</string>
+  <string name="incall_video_call_request_rejected">通話遭到拒絕</string>
+  <string name="incall_video_call_request_timed_out">通話要求逾時</string>
+  <string name="incall_hanging_up">掛斷中</string>
+  <string name="incall_call_ended">通話已結束</string>
+  <string name="incall_remotely_held">保留中</string>
+  <string name="contact_grid_incoming_video_call">電信業者視訊通話來電：</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi 電信業者視訊通話來電：</string>
+  <string name="contact_grid_incoming_voice_call">語音來電：</string>
+  <string name="contact_grid_incoming_work_call">公司來電：</string>
+  <string name="contact_grid_incoming_via_template">有人透過 %s 來電</string>
+  <string name="contact_grid_incoming_suspected_spam">可疑的騷擾/廣告來電者</string>
+  <string name="contact_grid_callback_number">這支手機的號碼：%1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
index d1aaba352..63412cf93 100644
--- a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 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="incall_calling_via_template" msgid="3416867359475780924">"Ishaya ucingo nge-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Iyashaya..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Iyadlulisela..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Ayikwazanga ukuxhumeka"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Ucingo lunqatshiwe"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Ucingo luphelelwe yisikhathi"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Iyavala"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Ikholi iqediwe"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Ibambile"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Ikholi esuka ku-"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ikholi yomsebenzi kusukela ku-"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Ingena nge-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Ofonayo osolisayo wogaxekile"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Inombolo yokuphinda ushayele: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ishaya ucingo nge-%s</string>
+  <string name="incall_calling_on_same_carrier_template">Ishaya kunkampani yenethiwekhi efanayo ye-%s</string>
+  <string name="incall_calling_on_recent_choice_template">Ishaya ekukhethweni kwakamuva kwe-%s</string>
+  <string name="incall_connecting">Iyashaya...</string>
+  <string name="incall_connecting_assited_dialed">Ukushaya kusetshenziswa okuthi +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Isebenzisa okungu-+%1$s (%2$s)…</string>
+  <string name="incall_transferring">Iyadlulisela...</string>
+  <string name="incall_video_call_requesting">Ukushaya kwevidiyo kwenkampani yenethiwekhi...</string>
+  <string name="incall_wifi_video_call_requesting">Ukushaya kwevidiyo kwenkampani yenethiwekhi ye-Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Ishintshela kuvidiyo yenkampani yenethiwekhi…</string>
+  <string name="incall_video_call_request_failed">Ayikwazanga ukuxhumeka</string>
+  <string name="incall_video_call_request_rejected">Ucingo lunqatshiwe</string>
+  <string name="incall_video_call_request_timed_out">Ucingo luphelelwe yisikhathi</string>
+  <string name="incall_hanging_up">Iyavala</string>
+  <string name="incall_call_ended">Ikholi iqediwe</string>
+  <string name="incall_remotely_held">Ibambile</string>
+  <string name="contact_grid_incoming_video_call">Ikholi yevidiyo yenkampani yenethiwekhi kusukela</string>
+  <string name="contact_grid_incoming_wifi_video_call">Ukushaya kwevidiyo kwenkampani yenethiwekhi kwe-Wi-Fi kusukela</string>
+  <string name="contact_grid_incoming_voice_call">Ikholi esuka ku-</string>
+  <string name="contact_grid_incoming_work_call">Ikholi yomsebenzi kusukela ku-</string>
+  <string name="contact_grid_incoming_via_template">Ingena nge-%s</string>
+  <string name="contact_grid_incoming_suspected_spam">Ofonayo osolisayo wogaxekile</string>
+  <string name="contact_grid_callback_number">Le nombolo yefoni: %1$s</string>
 </resources>
author	Eric Erfanian <erfanian@google.com>	2018-07-10 15:43:01 -0700
committer	Eric Erfanian <erfanian@google.com>	2018-07-10 15:43:01 -0700
commit	cfeab7055f1082aded8b52aad7a110ccade313f8 (patch)
tree	0755157940ee2d8b50960712e788d286c50e7d9b /java/com/android/incallui/contactgrid/res
parent	e0dbd9f9074559d73e93aeacc3ba27f65e820670 (diff)