From cfeab7055f1082aded8b52aad7a110ccade313f8 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Tue, 10 Jul 2018 15:43:01 -0700
Subject: Update translation strings.

Test: make
Change-Id: Ib75f4f25e91067311de244d7f1fb95bc898aec22
---
 .../cameraui/res/values-af/strings.xml             | 33 +++----------
 .../cameraui/res/values-am/strings.xml             | 33 +++----------
 .../cameraui/res/values-ar/strings.xml             | 33 +++----------
 .../cameraui/res/values-az/strings.xml             | 33 +++----------
 .../cameraui/res/values-b+sr+Latn/strings.xml      | 33 +++----------
 .../cameraui/res/values-be/strings.xml             | 33 +++----------
 .../cameraui/res/values-bg/strings.xml             | 33 +++----------
 .../cameraui/res/values-bn/strings.xml             | 33 +++----------
 .../cameraui/res/values-bs/strings.xml             | 33 +++----------
 .../cameraui/res/values-ca/strings.xml             | 33 +++----------
 .../cameraui/res/values-cs/strings.xml             | 33 +++----------
 .../cameraui/res/values-da/strings.xml             | 33 +++----------
 .../cameraui/res/values-de/strings.xml             | 33 +++----------
 .../cameraui/res/values-el/strings.xml             | 33 +++----------
 .../cameraui/res/values-en-rAU/strings.xml         | 33 +++----------
 .../cameraui/res/values-en-rGB/strings.xml         | 33 +++----------
 .../cameraui/res/values-en-rIN/strings.xml         | 33 +++----------
 .../cameraui/res/values-es-rUS/strings.xml         | 33 +++----------
 .../cameraui/res/values-es/strings.xml             | 33 +++----------
 .../cameraui/res/values-et/strings.xml             | 33 +++----------
 .../cameraui/res/values-eu/strings.xml             | 33 +++----------
 .../cameraui/res/values-fa/strings.xml             | 33 +++----------
 .../cameraui/res/values-fi/strings.xml             | 33 +++----------
 .../cameraui/res/values-fr-rCA/strings.xml         | 33 +++----------
 .../cameraui/res/values-fr/strings.xml             | 33 +++----------
 .../cameraui/res/values-gl/strings.xml             | 33 +++----------
 .../cameraui/res/values-gu/strings.xml             | 33 +++----------
 .../cameraui/res/values-hi/strings.xml             | 33 +++----------
 .../cameraui/res/values-hr/strings.xml             | 33 +++----------
 .../cameraui/res/values-hu/strings.xml             | 33 +++----------
 .../cameraui/res/values-hy/strings.xml             | 33 +++----------
 .../cameraui/res/values-in/strings.xml             | 33 +++----------
 .../cameraui/res/values-is/strings.xml             | 33 +++----------
 .../cameraui/res/values-it/strings.xml             | 33 +++----------
 .../cameraui/res/values-iw/strings.xml             | 33 +++----------
 .../cameraui/res/values-ja/strings.xml             | 33 +++----------
 .../cameraui/res/values-ka/strings.xml             | 33 +++----------
 .../cameraui/res/values-kk/strings.xml             | 33 +++----------
 .../cameraui/res/values-km/strings.xml             | 33 +++----------
 .../cameraui/res/values-kn/strings.xml             | 33 +++----------
 .../cameraui/res/values-ko/strings.xml             | 33 +++----------
 .../cameraui/res/values-ky/strings.xml             | 33 +++----------
 .../cameraui/res/values-lo/strings.xml             | 33 +++----------
 .../cameraui/res/values-lt/strings.xml             | 33 +++----------
 .../cameraui/res/values-lv/strings.xml             | 33 +++----------
 .../cameraui/res/values-mk/strings.xml             | 33 +++----------
 .../cameraui/res/values-ml/strings.xml             | 33 +++----------
 .../cameraui/res/values-mn/strings.xml             | 33 +++----------
 .../cameraui/res/values-mr/strings.xml             | 33 +++----------
 .../cameraui/res/values-ms/strings.xml             | 33 +++----------
 .../cameraui/res/values-my/strings.xml             | 33 +++----------
 .../cameraui/res/values-nb/strings.xml             | 33 +++----------
 .../cameraui/res/values-ne/strings.xml             | 33 +++----------
 .../cameraui/res/values-nl/strings.xml             | 33 +++----------
 .../cameraui/res/values-no/strings.xml             | 33 +++----------
 .../cameraui/res/values-pa/strings.xml             | 33 +++----------
 .../cameraui/res/values-pl/strings.xml             | 33 +++----------
 .../cameraui/res/values-pt-rBR/strings.xml         | 33 +++----------
 .../cameraui/res/values-pt-rPT/strings.xml         | 33 +++----------
 .../cameraui/res/values-pt/strings.xml             | 33 +++----------
 .../cameraui/res/values-ro/strings.xml             | 33 +++----------
 .../cameraui/res/values-ru/strings.xml             | 33 +++----------
 .../cameraui/res/values-si/strings.xml             | 33 +++----------
 .../cameraui/res/values-sk/strings.xml             | 33 +++----------
 .../cameraui/res/values-sl/strings.xml             | 33 +++----------
 .../cameraui/res/values-sq/strings.xml             | 33 +++----------
 .../cameraui/res/values-sr/strings.xml             | 33 +++----------
 .../cameraui/res/values-sv/strings.xml             | 33 +++----------
 .../cameraui/res/values-sw/strings.xml             | 33 +++----------
 .../cameraui/res/values-ta/strings.xml             | 33 +++----------
 .../cameraui/res/values-te/strings.xml             | 33 +++----------
 .../cameraui/res/values-th/strings.xml             | 33 +++----------
 .../cameraui/res/values-tl/strings.xml             | 33 +++----------
 .../cameraui/res/values-tr/strings.xml             | 33 +++----------
 .../cameraui/res/values-uk/strings.xml             | 33 +++----------
 .../cameraui/res/values-ur/strings.xml             | 33 +++----------
 .../cameraui/res/values-uz/strings.xml             | 33 +++----------
 .../cameraui/res/values-vi/strings.xml             | 33 +++----------
 .../cameraui/res/values-zh-rCN/strings.xml         | 33 +++----------
 .../cameraui/res/values-zh-rHK/strings.xml         | 33 +++----------
 .../cameraui/res/values-zh-rTW/strings.xml         | 33 +++----------
 .../cameraui/res/values-zu/strings.xml             | 33 +++----------
 .../dialer/callcomposer/res/values-af/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-am/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ar/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-az/strings.xml  | 57 ++++++++--------------
 .../callcomposer/res/values-b+sr+Latn/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-be/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-bg/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-bn/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-bs/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ca/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-cs/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-da/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-de/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-el/strings.xml  | 57 ++++++++--------------
 .../callcomposer/res/values-en-rAU/strings.xml     | 57 ++++++++--------------
 .../callcomposer/res/values-en-rGB/strings.xml     | 57 ++++++++--------------
 .../callcomposer/res/values-en-rIN/strings.xml     | 57 ++++++++--------------
 .../callcomposer/res/values-es-rUS/strings.xml     | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-es/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-et/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-eu/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-fa/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-fi/strings.xml  | 57 ++++++++--------------
 .../callcomposer/res/values-fr-rCA/strings.xml     | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-fr/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-gl/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-gu/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-hi/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-hr/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-hu/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-hy/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-in/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-is/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-it/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-iw/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ja/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ka/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-kk/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-km/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-kn/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ko/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ky/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-lo/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-lt/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-lv/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-mk/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ml/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-mn/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-mr/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ms/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-my/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-nb/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ne/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-nl/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-no/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-pa/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-pl/strings.xml  | 57 ++++++++--------------
 .../callcomposer/res/values-pt-rBR/strings.xml     | 57 ++++++++--------------
 .../callcomposer/res/values-pt-rPT/strings.xml     | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-pt/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ro/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ru/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-si/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-sk/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-sl/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-sq/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-sr/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-sv/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-sw/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ta/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-te/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-th/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-tl/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-tr/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-uk/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-ur/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-uz/strings.xml  | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-vi/strings.xml  | 57 ++++++++--------------
 .../callcomposer/res/values-zh-rCN/strings.xml     | 57 ++++++++--------------
 .../callcomposer/res/values-zh-rHK/strings.xml     | 57 ++++++++--------------
 .../callcomposer/res/values-zh-rTW/strings.xml     | 57 ++++++++--------------
 .../dialer/callcomposer/res/values-zu/strings.xml  | 57 ++++++++--------------
 164 files changed, 2296 insertions(+), 5084 deletions(-)

(limited to 'java/com/android/dialer/callcomposer')

diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
index f6326c1ad..baca0b929 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Skakel oor na volskerm-kamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skakel oor na kameravoorskou"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skakel oor na voorste kamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skakel oor na agterste kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Neem foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Neem foto weer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Skakel oor na volskerm-kamera</string>
+  <string name="description_camera_switch_preview_screen">Skakel oor na kameravoorskou</string>
+  <string name="description_camera_switch_camera_facing">Skakel oor na voorste kamera</string>
+  <string name="description_camera_switch_camera_rear">Skakel oor na agterste kamera</string>
+  <string name="description_camera_take_picture">Neem foto</string>
+  <string name="description_camera_cancel_photo">Neem foto weer</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
index 87c70c75b..f862cd9e9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ወደ የፊት ካሜራ ይቀይሩ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ወደ የኋላ ካሜራ ይቀይሩ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ፎቶ ያንሱ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ፎቶ በድጋሚ ያንሱ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ</string>
+  <string name="description_camera_switch_preview_screen">ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ</string>
+  <string name="description_camera_switch_camera_facing">ወደ የፊት ካሜራ ይቀይሩ</string>
+  <string name="description_camera_switch_camera_rear">ወደ የኋላ ካሜራ ይቀይሩ</string>
+  <string name="description_camera_take_picture">ፎቶ ያንሱ</string>
+  <string name="description_camera_cancel_photo">ፎቶ በድጋሚ ያንሱ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
index fa27db7b6..f0e6d89c9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"التبديل إلى الكاميرا بملء الشاشة"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"التبديل إلى معاينة الكاميرا"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"تبديل إلى الكاميرا الأمامية"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"تبديل مرة أخرى إلى الكاميرا الأمامية"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"التقاط صورة"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"إعادة التقاط الصورة"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">التبديل إلى الكاميرا بملء الشاشة</string>
+  <string name="description_camera_switch_preview_screen">التبديل إلى معاينة الكاميرا</string>
+  <string name="description_camera_switch_camera_facing">تبديل إلى الكاميرا الأمامية</string>
+  <string name="description_camera_switch_camera_rear">تبديل مرة أخرى إلى الكاميرا الأمامية</string>
+  <string name="description_camera_take_picture">التقاط صورة</string>
+  <string name="description_camera_cancel_photo">إعادة التقاط الصورة</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
index bfbf204cd..36f52cf79 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekranlı kameraya keçin"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizləməsinə keçin"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya keçin"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arxa kameraya keçin"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto çəkin"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotonu yenidən çəkin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Tam ekranlı kameraya keçin</string>
+  <string name="description_camera_switch_preview_screen">Kamera önizləməsinə keçin</string>
+  <string name="description_camera_switch_camera_facing">Ön kameraya keçin</string>
+  <string name="description_camera_switch_camera_rear">Arxa kameraya keçin</string>
+  <string name="description_camera_take_picture">Foto çəkin</string>
+  <string name="description_camera_cancel_photo">Fotonu yenidən çəkin</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
index 565b18810..3d96e0c2b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Prebacite na prikaz kamere preko celog ekrana"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebacite na pregled kamere"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebacite na prednju kameru"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebacite na zadnju kameru"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimite sliku"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimite sliku"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prebacite na prikaz kamere preko celog ekrana</string>
+  <string name="description_camera_switch_preview_screen">Prebacite na pregled kamere</string>
+  <string name="description_camera_switch_camera_facing">Prebacite na prednju kameru</string>
+  <string name="description_camera_switch_camera_rear">Prebacite na zadnju kameru</string>
+  <string name="description_camera_take_picture">Snimite sliku</string>
+  <string name="description_camera_cancel_photo">Ponovo snimite sliku</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
index f15bbb945..d42f095ab 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Пераключыцца на поўнаэкранную камеру"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пераключыцца ў рэжым перадпрагляду камеры"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пераключыцца на пярэднюю камеру"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пераключыцца на заднюю камеру"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зрабіць фота"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зрабіць фота яшчэ раз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Пераключыцца на поўнаэкранную камеру</string>
+  <string name="description_camera_switch_preview_screen">Пераключыцца ў рэжым перадпрагляду камеры</string>
+  <string name="description_camera_switch_camera_facing">Пераключыцца на пярэднюю камеру</string>
+  <string name="description_camera_switch_camera_rear">Пераключыцца на заднюю камеру</string>
+  <string name="description_camera_take_picture">Зрабіць фота</string>
+  <string name="description_camera_cancel_photo">Зрабіць фота яшчэ раз</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
index 92352ffdb..4f2b601cf 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Превключване към камера на цял екран"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Превключване към визуализация на камерата"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Превключване към предната камера"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Превключване към задната камера."</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимане"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Повторно снимане"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Превключване към камера на цял екран</string>
+  <string name="description_camera_switch_preview_screen">Превключване към визуализация на камерата</string>
+  <string name="description_camera_switch_camera_facing">Превключване към предната камера</string>
+  <string name="description_camera_switch_camera_rear">Превключване към задната камера.</string>
+  <string name="description_camera_take_picture">Снимане</string>
+  <string name="description_camera_cancel_photo">Повторно снимане</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
index 83774c767..e7ac59ebc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"সম্পূর্ণ স্ক্রীন জুড়ে ক্যামেরা খুলুন"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ক্যামেরার পূর্বরূপ মোডে পাল্টান"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"সামনের ক্যামেরাতে পাল্টান"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"পিছনের ক্যামেরাতে পাল্টান"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ফটো তুলুন"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"আবার ফটো তুলুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">সম্পূর্ণ স্ক্রিন জুড়ে ক্যামেরা খুলুন</string>
+  <string name="description_camera_switch_preview_screen">ক্যামেরার পূর্বরূপ মোডে পাল্টান</string>
+  <string name="description_camera_switch_camera_facing">সামনের ক্যামেরাতে পাল্টান</string>
+  <string name="description_camera_switch_camera_rear">পিছনের ক্যামেরাতে পাল্টান</string>
+  <string name="description_camera_take_picture">ফটো তুলুন</string>
+  <string name="description_camera_cancel_photo">আবার ফটো তুলুন</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
index c77a5de8d..896cad137 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na kameru preko cijelog ekrana"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled kamere"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednju kameru"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnju kameru"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimi fotografiju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prebaci na kameru preko cijelog ekrana</string>
+  <string name="description_camera_switch_preview_screen">Prebaci na pregled kamere</string>
+  <string name="description_camera_switch_camera_facing">Prebaci na prednju kameru</string>
+  <string name="description_camera_switch_camera_rear">Prebaci na zadnju kameru</string>
+  <string name="description_camera_take_picture">Snimi fotografiju</string>
+  <string name="description_camera_cancel_photo">Ponovo snimi fotografiju</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
index 39c069b88..acef5a80f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Canvia a la càmera en pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Canvia a la previsualització de la càmera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Canvia a la càmera frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Canvia a la càmera posterior"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fes una foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Torna a fer la foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Canvia a la càmera en pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Canvia a la previsualització de la càmera</string>
+  <string name="description_camera_switch_camera_facing">Canvia a la càmera frontal</string>
+  <string name="description_camera_switch_camera_rear">Canvia a la càmera posterior</string>
+  <string name="description_camera_take_picture">Fes una foto</string>
+  <string name="description_camera_cancel_photo">Torna a fer la foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
index 222eb812e..e29825c15 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Přepnout na fotoaparát na celou obrazovku"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Přepnout na náhled fotoaparátu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Přepnout na přední fotoaparát"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Přepnout na zadní fotoaparát"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Vyfotit"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znovu vyfotit"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Přepnout na fotoaparát na celou obrazovku</string>
+  <string name="description_camera_switch_preview_screen">Přepnout na náhled fotoaparátu</string>
+  <string name="description_camera_switch_camera_facing">Přepnout na přední fotoaparát</string>
+  <string name="description_camera_switch_camera_rear">Přepnout na zadní fotoaparát</string>
+  <string name="description_camera_take_picture">Vyfotit</string>
+  <string name="description_camera_cancel_photo">Znovu vyfotit</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
index 0de7e0861..0f1dda4ae 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Skift til kamera i fuld skærm"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skift til forhåndsvisning af kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skift til kamera på forsiden"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skift til kamera på bagsiden"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tag billede"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tag billedet om"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Skift til kamera i fuld skærm</string>
+  <string name="description_camera_switch_preview_screen">Skift til forhåndsvisning af kamera</string>
+  <string name="description_camera_switch_camera_facing">Skift til kamera på forsiden</string>
+  <string name="description_camera_switch_camera_rear">Skift til kamera på bagsiden</string>
+  <string name="description_camera_take_picture">Tag billede</string>
+  <string name="description_camera_cancel_photo">Tag billedet om</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
index 1b0d63906..576b96396 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Zur Vollbildkamera wechseln"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Zur Kameravorschau wechseln"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Zur Frontkamera wechseln"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Zur Rückkamera wechseln"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto aufnehmen"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto neu aufnehmen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Zur Vollbildkamera wechseln</string>
+  <string name="description_camera_switch_preview_screen">Zur Kameravorschau wechseln</string>
+  <string name="description_camera_switch_camera_facing">Zur Frontkamera wechseln</string>
+  <string name="description_camera_switch_camera_rear">Zur Rückkamera wechseln</string>
+  <string name="description_camera_take_picture">Foto aufnehmen</string>
+  <string name="description_camera_cancel_photo">Foto neu aufnehmen</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
index d657f936f..aadf7ce83 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Εναλλαγή σε προεπισκόπηση κάμερας"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Εναλλαγή σε κάμερα πρόσοψης"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Εναλλαγή σε πίσω κάμερα"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Λήψη φωτογραφίας"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Επανάληψη λήψης φωτογραφίας"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Εναλλαγή σε κάμερα πλήρους οθόνης</string>
+  <string name="description_camera_switch_preview_screen">Εναλλαγή σε προεπισκόπηση κάμερας</string>
+  <string name="description_camera_switch_camera_facing">Εναλλαγή σε κάμερα πρόσοψης</string>
+  <string name="description_camera_switch_camera_rear">Εναλλαγή σε πίσω κάμερα</string>
+  <string name="description_camera_take_picture">Λήψη φωτογραφίας</string>
+  <string name="description_camera_cancel_photo">Επανάληψη λήψης φωτογραφίας</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
index 9e76a69a5..0447b9b3b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Switch to full-screen camera</string>
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
+  <string name="description_camera_switch_camera_facing">Switch to front-facing camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to rear-facing camera</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
index 9e76a69a5..0447b9b3b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Switch to full-screen camera</string>
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
+  <string name="description_camera_switch_camera_facing">Switch to front-facing camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to rear-facing camera</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
index 9e76a69a5..0447b9b3b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Switch to full-screen camera</string>
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
+  <string name="description_camera_switch_camera_facing">Switch to front-facing camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to rear-facing camera</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
index f10356496..80762615a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a cámara en pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a vista previa de la cámara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a cámara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a cámara trasera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tomar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Volver a tomar foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Cambiar a cámara en pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Cambiar a vista previa de la cámara</string>
+  <string name="description_camera_switch_camera_facing">Cambiar a cámara frontal</string>
+  <string name="description_camera_switch_camera_rear">Cambiar a cámara trasera</string>
+  <string name="description_camera_take_picture">Tomar foto</string>
+  <string name="description_camera_cancel_photo">Volver a tomar foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
index 5afb8c8c3..1911b557a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a la cámara en pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a la vista previa de la cámara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a la cámara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a la cámara trasera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Hacer una foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repetir la foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Cambiar a la cámara en pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Cambiar a la vista previa de la cámara</string>
+  <string name="description_camera_switch_camera_facing">Cambiar a la cámara frontal</string>
+  <string name="description_camera_switch_camera_rear">Cambiar a la cámara trasera</string>
+  <string name="description_camera_take_picture">Hacer una foto</string>
+  <string name="description_camera_cancel_photo">Repetir la foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
index d4c37fee9..e85de2427 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Täisekraaniga kaamerale lülitumine"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kaamera eelvaatele lülitumine"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Esikaamerale lülitumine"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Tagakaamerale lülitumine"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto jäädvustamine"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto uuesti jäädvustamine"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Täisekraaniga kaamerale lülitumine</string>
+  <string name="description_camera_switch_preview_screen">Kaamera eelvaatele lülitumine</string>
+  <string name="description_camera_switch_camera_facing">Esikaamerale lülitumine</string>
+  <string name="description_camera_switch_camera_rear">Tagakaamerale lülitumine</string>
+  <string name="description_camera_take_picture">Foto jäädvustamine</string>
+  <string name="description_camera_cancel_photo">Foto uuesti jäädvustamine</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
index 4271983ed..1ce1d8c88 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Erabili pantaila osoko kamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Erabili kameraren aurrebista"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Erabili aurreko kamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Erabili atzeko kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Atera argazkia"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atera berriro argazkia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Erabili pantaila osoko kamera</string>
+  <string name="description_camera_switch_preview_screen">Erabili kameraren aurrebista</string>
+  <string name="description_camera_switch_camera_facing">Erabili aurreko kamera</string>
+  <string name="description_camera_switch_camera_rear">Erabili atzeko kamera</string>
+  <string name="description_camera_take_picture">Atera argazkia</string>
+  <string name="description_camera_cancel_photo">Atera berriro argazkia</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
index 5d5877101..157beefcd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"رفتن به دوربین تمام صفحه"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"رفتن به پیش‌نمایش دوربین"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"رفتن به دوربین جلو"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"رفتن به دوربین عقب"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"عکس گرفتن"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"عکس گرفتن مجدد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">رفتن به دوربین تمام صفحه</string>
+  <string name="description_camera_switch_preview_screen">رفتن به پیش‌نمایش دوربین</string>
+  <string name="description_camera_switch_camera_facing">رفتن به دوربین جلو</string>
+  <string name="description_camera_switch_camera_rear">رفتن به دوربین عقب</string>
+  <string name="description_camera_take_picture">عکس گرفتن</string>
+  <string name="description_camera_cancel_photo">عکس گرفتن مجدد</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
index 9d7cb0922..946952411 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Siirry koko näytön kameraan"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Siirry kameran esikatseluun"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Vaihda etukameraan"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Vaihda takakameraan"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ota kuva"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ota kuva uudelleen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Siirry koko näytön kameraan</string>
+  <string name="description_camera_switch_preview_screen">Siirry kameran esikatseluun</string>
+  <string name="description_camera_switch_camera_facing">Vaihda etukameraan</string>
+  <string name="description_camera_switch_camera_rear">Vaihda takakameraan</string>
+  <string name="description_camera_take_picture">Ota kuva</string>
+  <string name="description_camera_cancel_photo">Ota kuva uudelleen</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
index b20284080..a2f10bc44 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Passer au mode Plein écran de l\'appareil photo"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer au mode Aperçu de l\'appareil photo"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passer à l\'appareil photo avant"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passer à l\'appareil photo arrière"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Passer au mode Plein écran de l\'appareil photo</string>
+  <string name="description_camera_switch_preview_screen">Passer au mode Aperçu de l\'appareil photo</string>
+  <string name="description_camera_switch_camera_facing">Passer à l\'appareil photo avant</string>
+  <string name="description_camera_switch_camera_rear">Passer à l\'appareil photo arrière</string>
+  <string name="description_camera_take_picture">Prendre une photo</string>
+  <string name="description_camera_cancel_photo">Reprendre la photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
index a9cfe7124..50df31bc7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Passer en mode plein écran"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer en mode aperçu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Utiliser la caméra avant"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Utiliser la caméra arrière"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Passer en mode plein écran</string>
+  <string name="description_camera_switch_preview_screen">Passer en mode aperçu</string>
+  <string name="description_camera_switch_camera_facing">Utiliser la caméra avant</string>
+  <string name="description_camera_switch_camera_rear">Utiliser la caméra arrière</string>
+  <string name="description_camera_take_picture">Prendre une photo</string>
+  <string name="description_camera_cancel_photo">Reprendre la photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
index 3568a0fc3..b9be419d1 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Cambia á cámara de pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambia á vista previa da cámara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambia á cámara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambia á cámara traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tira unha foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repite a foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Cambia á cámara de pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Cambia á vista previa da cámara</string>
+  <string name="description_camera_switch_camera_facing">Cambia á cámara frontal</string>
+  <string name="description_camera_switch_camera_rear">Cambia á cámara traseira</string>
+  <string name="description_camera_take_picture">Tira unha foto</string>
+  <string name="description_camera_cancel_photo">Repite a foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
index 88037b582..6e752d9dd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"પાછળના કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ફોટો લો"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ફોટો ફરીથી લો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો</string>
+  <string name="description_camera_switch_preview_screen">કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો</string>
+  <string name="description_camera_switch_camera_facing">ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો</string>
+  <string name="description_camera_switch_camera_rear">પાછળના કૅમેરા પર સ્વિચ કરો</string>
+  <string name="description_camera_take_picture">ફોટો લો</string>
+  <string name="description_camera_cancel_photo">ફોટો ફરીથી લો</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
index 09a441f08..52973b6dd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कैमरे में बदलें"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कैमरा पूर्वावलोकन में बदलें"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"सामने वाले कैमरे में बदलें"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पीछे वाले कैमरे में बदलें"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"फ़ोटो लें"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फि‍र से फ़ोटो लें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">पूर्ण स्क्रीन कैमरे में बदलें</string>
+  <string name="description_camera_switch_preview_screen">कैमरा पूर्वावलोकन में बदलें</string>
+  <string name="description_camera_switch_camera_facing">सामने वाले कैमरे में बदलें</string>
+  <string name="description_camera_switch_camera_rear">पीछे वाले कैमरे में बदलें</string>
+  <string name="description_camera_take_picture">फ़ोटो लें</string>
+  <string name="description_camera_cancel_photo">फि‍र से फ़ोटो लें</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
index 2dca9bd45..3db287541 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na prikaz fotoaparata preko cijelog zaslona"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled fotoaparata"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednji fotoaparat"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnji fotoaparat"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovno snimi fotografiju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prebaci na prikaz fotoaparata preko cijelog zaslona</string>
+  <string name="description_camera_switch_preview_screen">Prebaci na pregled fotoaparata</string>
+  <string name="description_camera_switch_camera_facing">Prebaci na prednji fotoaparat</string>
+  <string name="description_camera_switch_camera_rear">Prebaci na stražnji fotoaparat</string>
+  <string name="description_camera_take_picture">Snimi fotografiju</string>
+  <string name="description_camera_cancel_photo">Ponovno snimi fotografiju</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
index 5007b3f73..a32d4ee62 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Váltás teljes képernyős kameranézetre"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Váltás kamera-előnézetre"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Váltás az első kamerára"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Váltás a hátsó kamerára"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotó készítése"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Új felvétel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Váltás teljes képernyős kameranézetre</string>
+  <string name="description_camera_switch_preview_screen">Váltás kamera-előnézetre</string>
+  <string name="description_camera_switch_camera_facing">Váltás az első kamerára</string>
+  <string name="description_camera_switch_camera_rear">Váltás a hátsó kamerára</string>
+  <string name="description_camera_take_picture">Fotó készítése</string>
+  <string name="description_camera_cancel_photo">Új felvétel</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
index 2c1bd79e6..ef133c2cb 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Միացնել լիաէկրան ռեժիմը"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Միացնել նախադիտման ռեժիմը"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Միացնել առջևի տեսախցիկը"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Միացնել հետևի տեսախցիկը"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Լուսանկարել"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Նորից լուսանկարել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Միացնել լիաէկրան ռեժիմը</string>
+  <string name="description_camera_switch_preview_screen">Միացնել նախադիտման ռեժիմը</string>
+  <string name="description_camera_switch_camera_facing">Միացնել առջևի տեսախցիկը</string>
+  <string name="description_camera_switch_camera_rear">Միացնել հետևի տեսախցիկը</string>
+  <string name="description_camera_take_picture">Լուսանկարել</string>
+  <string name="description_camera_cancel_photo">Նորից լուսանկարել</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
index 4c922cd41..d238778e3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera layar penuh"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratinjau kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera depan"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera belakang"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil ulang foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Beralih ke kamera layar penuh</string>
+  <string name="description_camera_switch_preview_screen">Beralih ke pratinjau kamera</string>
+  <string name="description_camera_switch_camera_facing">Beralih ke kamera depan</string>
+  <string name="description_camera_switch_camera_rear">Beralih ke kamera belakang</string>
+  <string name="description_camera_take_picture">Ambil foto</string>
+  <string name="description_camera_cancel_photo">Ambil ulang foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
index c796d2295..b01e64319 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Skipta yfir í myndavél á öllum skjánum"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skipta yfir í forskoðun á myndavél"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skipta yfir í fremri myndavél"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skipta yfir í aftari myndavél"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Taka mynd"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Taka mynd aftur"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Skipta yfir í myndavél á öllum skjánum</string>
+  <string name="description_camera_switch_preview_screen">Skipta yfir í forskoðun á myndavél</string>
+  <string name="description_camera_switch_camera_facing">Skipta yfir í fremri myndavél</string>
+  <string name="description_camera_switch_camera_rear">Skipta yfir í aftari myndavél</string>
+  <string name="description_camera_take_picture">Taka mynd</string>
+  <string name="description_camera_cancel_photo">Taka mynd aftur</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
index abf5d3f5e..0c4a56ec9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Passa alla fotocamera a schermo intero"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passa all\'anteprima della fotocamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passa alla fotocamera anteriore"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passa alla fotocamera posteriore"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Scatta foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Scatta foto di nuovo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Passa alla fotocamera a schermo intero</string>
+  <string name="description_camera_switch_preview_screen">Passa all\'anteprima della fotocamera</string>
+  <string name="description_camera_switch_camera_facing">Passa alla fotocamera anteriore</string>
+  <string name="description_camera_switch_camera_rear">Passa alla fotocamera posteriore</string>
+  <string name="description_camera_take_picture">Scatta foto</string>
+  <string name="description_camera_cancel_photo">Scatta foto di nuovo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
index e6aed2e96..67bc889e8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"מעבר למצלמה במסך מלא"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"מעבר לתצוגה מקדימה של המצלמה"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"מעבר למצלמה הקדמית"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"מעבר למצלמה האחורית"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"צילום תמונה"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"צילום מחדש של התמונה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">מעבר למצלמה במסך מלא</string>
+  <string name="description_camera_switch_preview_screen">מעבר לתצוגה מקדימה של המצלמה</string>
+  <string name="description_camera_switch_camera_facing">מעבר למצלמה הקדמית</string>
+  <string name="description_camera_switch_camera_rear">מעבר למצלמה האחורית</string>
+  <string name="description_camera_take_picture">צילום תמונה</string>
+  <string name="description_camera_cancel_photo">צילום מחדש של התמונה</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
index 85ef3c8d7..d90338870 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"全画面カメラに切り替えます"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"カメラのプレビューに切り替えます"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"前面カメラに切り替えます"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"背面カメラに切り替えます"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"写真を撮影します"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"写真を撮り直します"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">全画面カメラに切り替えます</string>
+  <string name="description_camera_switch_preview_screen">カメラのプレビューに切り替えます</string>
+  <string name="description_camera_switch_camera_facing">前面カメラに切り替えます</string>
+  <string name="description_camera_switch_camera_rear">背面カメラに切り替えます</string>
+  <string name="description_camera_take_picture">写真を撮影します</string>
+  <string name="description_camera_cancel_photo">写真を撮り直します</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
index edaf33ffe..ccb6484e9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"სრულეკრანიან კამერაზე გადართვა"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"კამერის წინასწარ ხედზე გადართვა"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"წინა კამერაზე გადართვა"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"უკანა კამერაზე გადართვა"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ფოტოს გადაღება"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ფოტოს ხელახლა გადაღება"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">სრულეკრანიან კამერაზე გადართვა</string>
+  <string name="description_camera_switch_preview_screen">კამერის წინასწარ ხედზე გადართვა</string>
+  <string name="description_camera_switch_camera_facing">წინა კამერაზე გადართვა</string>
+  <string name="description_camera_switch_camera_rear">უკანა კამერაზე გადართვა</string>
+  <string name="description_camera_take_picture">ფოტოს გადაღება</string>
+  <string name="description_camera_cancel_photo">ფოტოს ხელახლა გადაღება</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
index 795a06392..11c91c659 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Толық экранды камераға ауысу"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераның алдын ала көру режиміне ауысу"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Камераның анфас режиміне ауысу"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Камераның қалыпты режиміне ауысу"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Суретке түсіру"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Суретке қайта түсіру"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Толық экранды камераға ауысу</string>
+  <string name="description_camera_switch_preview_screen">Камераның алдын ала көру режиміне ауысу</string>
+  <string name="description_camera_switch_camera_facing">Камераның анфас режиміне ауысу</string>
+  <string name="description_camera_switch_camera_rear">Камераның қалыпты режиміне ауысу</string>
+  <string name="description_camera_take_picture">Суретке түсіру</string>
+  <string name="description_camera_cancel_photo">Суретке қайта түсіру</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
index 377f885cb..dfb2781b1 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ប្តូរទៅកាមេរ៉ាខាងក្រោយ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ថតរូប"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ថតរូប​ឡើងវិញ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់</string>
+  <string name="description_camera_switch_preview_screen">ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង</string>
+  <string name="description_camera_switch_camera_facing">ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ</string>
+  <string name="description_camera_switch_camera_rear">ប្តូរទៅកាមេរ៉ាខាងក្រោយ</string>
+  <string name="description_camera_take_picture">ថតរូប</string>
+  <string name="description_camera_cancel_photo">ថតរូប​ឡើងវិញ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
index 1f5d1ea54..b95e118e7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ</string>
+  <string name="description_camera_switch_preview_screen">ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ</string>
+  <string name="description_camera_switch_camera_facing">ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ</string>
+  <string name="description_camera_switch_camera_rear">ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ</string>
+  <string name="description_camera_take_picture">ಫೋಟೋ ತೆಗೆಯಿರಿ</string>
+  <string name="description_camera_cancel_photo">ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
index 1b675e746..d29695048 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"전체화면 카메라로 전환"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"카메라 미리보기로 전환"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"전면 카메라로 전환"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"후면 카메라로 전환"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"사진 찍기"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"사진 다시 찍기"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">전체화면 카메라로 전환</string>
+  <string name="description_camera_switch_preview_screen">카메라 미리보기로 전환</string>
+  <string name="description_camera_switch_camera_facing">전면 카메라로 전환</string>
+  <string name="description_camera_switch_camera_rear">후면 카메라로 전환</string>
+  <string name="description_camera_take_picture">사진 찍기</string>
+  <string name="description_camera_cancel_photo">사진 다시 찍기</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
index 771f5769d..f4714128e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Камераны толук экранга которуу"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераны алдын ала көрүү режимине которуу"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Маңдайкы камерага которуу"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Арткы камерага которуу"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сүрөткө тартуу"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Кайра сүрөткө тартуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Камераны толук экранга которуу</string>
+  <string name="description_camera_switch_preview_screen">Камераны алдын ала көрүү режимине которуу</string>
+  <string name="description_camera_switch_camera_facing">Маңдайкы камерага которуу</string>
+  <string name="description_camera_switch_camera_rear">Арткы камерага которуу</string>
+  <string name="description_camera_take_picture">Сүрөткө тартуу</string>
+  <string name="description_camera_cancel_photo">Кайра сүрөткө тартуу</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
index 6bfdf4e76..fa8261c64 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ຖ່າຍຮູບ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ຖ່າຍຮູບໃໝ່"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ</string>
+  <string name="description_camera_switch_preview_screen">ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ</string>
+  <string name="description_camera_switch_camera_facing">ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ</string>
+  <string name="description_camera_switch_camera_rear">ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ</string>
+  <string name="description_camera_take_picture">ຖ່າຍຮູບ</string>
+  <string name="description_camera_cancel_photo">ຖ່າຍຮູບໃໝ່</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
index 6ff3b0db6..783878f29 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Perjungti į fotoaparato peržiūrą"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Perjungti į priekinį fotoaparatą"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Perjungti į užpakalinį fotoaparatą"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografuoti"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotografuoti iš naujo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Perjungti į viso ekrano režimu veikiantį fotoaparatą</string>
+  <string name="description_camera_switch_preview_screen">Perjungti į fotoaparato peržiūrą</string>
+  <string name="description_camera_switch_camera_facing">Perjungti į priekinį fotoaparatą</string>
+  <string name="description_camera_switch_camera_rear">Perjungti į užpakalinį fotoaparatą</string>
+  <string name="description_camera_take_picture">Fotografuoti</string>
+  <string name="description_camera_cancel_photo">Fotografuoti iš naujo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
index d6d4782fb..bca0cdd79 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Pārslēgt uz pilnekrāna kameru"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Pārslēgt uz kameras priekšskatījumu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Pārslēgt uz priekšējo kameru"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Pārslēgt uz aizmugurējo kameru"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Uzņemt fotoattēlu"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atkārtoti uzņemt fotoattēlu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Pārslēgt uz pilnekrāna kameru</string>
+  <string name="description_camera_switch_preview_screen">Pārslēgt uz kameras priekšskatījumu</string>
+  <string name="description_camera_switch_camera_facing">Pārslēgt uz priekšējo kameru</string>
+  <string name="description_camera_switch_camera_rear">Pārslēgt uz aizmugurējo kameru</string>
+  <string name="description_camera_take_picture">Uzņemt fotoattēlu</string>
+  <string name="description_camera_cancel_photo">Atkārtoti uzņemt fotoattēlu</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
index a0f84a035..c620fb987 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Префрлете на камера на цел екран"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Префрлете на преглед на камера"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Префрлете на предна камера"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Префрлете на задна камера"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Фотографирај"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Фотографирај пак"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Префрлете на камера на цел екран</string>
+  <string name="description_camera_switch_preview_screen">Префрлете на преглед на камера</string>
+  <string name="description_camera_switch_camera_facing">Префрлете на предна камера</string>
+  <string name="description_camera_switch_camera_rear">Префрлете на задна камера</string>
+  <string name="description_camera_take_picture">Фотографирај</string>
+  <string name="description_camera_cancel_photo">Фотографирај пак</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
index 77c0a4f85..b666f5129 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"മുൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"പിൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ഫോട്ടോ എടുക്കുക"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ഫോട്ടോ വീണ്ടുമെടുക്കുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക</string>
+  <string name="description_camera_switch_preview_screen">ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക</string>
+  <string name="description_camera_switch_camera_facing">മുൻ ക്യാമറയിലേക്ക് മാറുക</string>
+  <string name="description_camera_switch_camera_rear">പിൻ ക്യാമറയിലേക്ക് മാറുക</string>
+  <string name="description_camera_take_picture">ഫോട്ടോ എടുക്കുക</string>
+  <string name="description_camera_cancel_photo">ഫോട്ടോ വീണ്ടുമെടുക്കുക</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
index 1894634ea..d31d155ad 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камерын урьдчилан үзэх рүү сэлгэх"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Урд талын камер руу сэлгэх"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Ар талын камер руу сэлгэх"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зураг авах"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зураг дахин авах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Бүтэн дэлгэцийн камер руу сэлгэх</string>
+  <string name="description_camera_switch_preview_screen">Камерын урьдчилан үзэх рүү сэлгэх</string>
+  <string name="description_camera_switch_camera_facing">Урд талын камер руу сэлгэх</string>
+  <string name="description_camera_switch_camera_rear">Ар талын камер руу сэлгэх</string>
+  <string name="description_camera_take_picture">Зураг авах</string>
+  <string name="description_camera_cancel_photo">Зураг дахин авах</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
index 24c1931d9..24861dac7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कॅमेरा पूर्वावलोकनावर स्विच करा"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"समोरील कॅमऱ्यावर स्विच करा"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"मागील कॅमेर्‍यावर स्‍विच करा"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"फोटो घ्‍या"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फोटो पुन्हा घ्या"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा</string>
+  <string name="description_camera_switch_preview_screen">कॅमेरा पूर्वावलोकनावर स्विच करा</string>
+  <string name="description_camera_switch_camera_facing">समोरील कॅमऱ्यावर स्विच करा</string>
+  <string name="description_camera_switch_camera_rear">मागील कॅमेर्‍यावर स्‍विच करा</string>
+  <string name="description_camera_take_picture">फोटो घ्‍या</string>
+  <string name="description_camera_cancel_photo">फोटो पुन्हा घ्या</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
index 44806f53e..8e2033090 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera skrin penuh"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratonton kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera menghadap depan"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera menghadap belakang"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil semula foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Beralih ke kamera skrin penuh</string>
+  <string name="description_camera_switch_preview_screen">Beralih ke pratonton kamera</string>
+  <string name="description_camera_switch_camera_facing">Beralih ke kamera menghadap depan</string>
+  <string name="description_camera_switch_camera_rear">Beralih ke kamera menghadap belakang</string>
+  <string name="description_camera_take_picture">Ambil foto</string>
+  <string name="description_camera_cancel_photo">Ambil semula foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
index 7112abc7d..8ea803e1c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"အရှေ့ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"အနောက်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ဓာတ်ပုံရိုက်ရန်"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ဓာတ်ပုံပြန်ရိုက်ရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်</string>
+  <string name="description_camera_switch_preview_screen">ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်</string>
+  <string name="description_camera_switch_camera_facing">အရှေ့ကင်မရာသို့ ပြောင်းရန်</string>
+  <string name="description_camera_switch_camera_rear">အနောက်ကင်မရာသို့ ပြောင်းရန်</string>
+  <string name="description_camera_take_picture">ဓာတ်ပုံရိုက်ရန်</string>
+  <string name="description_camera_cancel_photo">ဓာတ်ပုံပြန်ရိုက်ရန်</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
index 5e5fb601e..329234594 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Bytt til fullskjermkamera</string>
+  <string name="description_camera_switch_preview_screen">Bytt til forhåndsvisning for kamera</string>
+  <string name="description_camera_switch_camera_facing">Bytt til frontkamera</string>
+  <string name="description_camera_switch_camera_rear">Bytt til bakovervendt kamera</string>
+  <string name="description_camera_take_picture">Ta bilde</string>
+  <string name="description_camera_cancel_photo">Ta bilde på nytt</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
index d8ea7954c..f124b4d76 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"अगाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पछाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"तस्बिर खिच्नुहोस्"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"पुन: तस्बिर खिच्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्</string>
+  <string name="description_camera_switch_preview_screen">क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्</string>
+  <string name="description_camera_switch_camera_facing">अगाडिपट्टिको क्यामेरामा बदल्नुहोस्</string>
+  <string name="description_camera_switch_camera_rear">पछाडिपट्टिको क्यामेरामा बदल्नुहोस्</string>
+  <string name="description_camera_take_picture">तस्बिर खिच्नुहोस्</string>
+  <string name="description_camera_cancel_photo">पुन: तस्बिर खिच्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
index 0369fedaa..69d9a7392 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Overschakelen naar camera op volledig scherm"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Overschakelen naar cameravoorbeeld"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Overschakelen naar camera aan voorzijde"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Overschakelen naar camera aan achterzijde"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto maken"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto opnieuw maken"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Overschakelen naar camera op volledig scherm</string>
+  <string name="description_camera_switch_preview_screen">Overschakelen naar cameravoorbeeld</string>
+  <string name="description_camera_switch_camera_facing">Overschakelen naar camera aan voorzijde</string>
+  <string name="description_camera_switch_camera_rear">Overschakelen naar camera aan achterzijde</string>
+  <string name="description_camera_take_picture">Foto maken</string>
+  <string name="description_camera_cancel_photo">Foto opnieuw maken</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
index 5e5fb601e..329234594 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Bytt til fullskjermkamera</string>
+  <string name="description_camera_switch_preview_screen">Bytt til forhåndsvisning for kamera</string>
+  <string name="description_camera_switch_camera_facing">Bytt til frontkamera</string>
+  <string name="description_camera_switch_camera_rear">Bytt til bakovervendt kamera</string>
+  <string name="description_camera_take_picture">Ta bilde</string>
+  <string name="description_camera_cancel_photo">Ta bilde på nytt</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
index e1247e071..6ed0529f4 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_switch_preview_screen">ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_switch_camera_facing">ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_switch_camera_rear">ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_take_picture">ਫ਼ੋਟੋ ਖਿੱਚੋ</string>
+  <string name="description_camera_cancel_photo">ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
index b85afa6aa..f9922a344 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Przełącz na aparat pełnoekranowy"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Przełącz na podgląd aparatu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Przełącz na przedni aparat"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Przełącz na tylny aparat"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Zrób zdjęcie"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Zrób nowe zdjęcie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Przełącz na aparat pełnoekranowy</string>
+  <string name="description_camera_switch_preview_screen">Przełącz na podgląd aparatu</string>
+  <string name="description_camera_switch_camera_facing">Przełącz na przedni aparat</string>
+  <string name="description_camera_switch_camera_rear">Przełącz na tylny aparat</string>
+  <string name="description_camera_take_picture">Zrób zdjęcie</string>
+  <string name="description_camera_cancel_photo">Zrób nowe zdjęcie</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
index 59f457c43..6f26785ed 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Alternar para câmera em tela cheia</string>
+  <string name="description_camera_switch_preview_screen">Alternar para visualização da câmera</string>
+  <string name="description_camera_switch_camera_facing">Alternar para câmera frontal</string>
+  <string name="description_camera_switch_camera_rear">Alternar para câmera traseira</string>
+  <string name="description_camera_take_picture">Tirar foto</string>
+  <string name="description_camera_cancel_photo">Tirar foto novamente</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
index 71f651dcb..252d0c0e4 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Mudar para a câmara de ecrã completo"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Mudar para a pré-visualização da câmara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Mudar para a câmara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Mudar para a câmara traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar nova foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Mudar para a câmara de ecrã completo</string>
+  <string name="description_camera_switch_preview_screen">Mudar para a pré-visualização da câmara</string>
+  <string name="description_camera_switch_camera_facing">Mudar para a câmara frontal</string>
+  <string name="description_camera_switch_camera_rear">Mudar para a câmara traseira</string>
+  <string name="description_camera_take_picture">Tirar foto</string>
+  <string name="description_camera_cancel_photo">Tirar nova foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
index 59f457c43..6f26785ed 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Alternar para câmera em tela cheia</string>
+  <string name="description_camera_switch_preview_screen">Alternar para visualização da câmera</string>
+  <string name="description_camera_switch_camera_facing">Alternar para câmera frontal</string>
+  <string name="description_camera_switch_camera_rear">Alternar para câmera traseira</string>
+  <string name="description_camera_take_picture">Tirar foto</string>
+  <string name="description_camera_cancel_photo">Tirar foto novamente</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
index f491f2887..31f7f39ce 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Comutați la camera pe ecran complet"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Comutați la previzualizarea camerei"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Comutați la camera frontală"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Comutați la camera posterioară"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografiați"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Refaceți fotografia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Comutați la camera pe ecran complet</string>
+  <string name="description_camera_switch_preview_screen">Comutați la previzualizarea camerei</string>
+  <string name="description_camera_switch_camera_facing">Comutați la camera frontală</string>
+  <string name="description_camera_switch_camera_rear">Comutați la camera posterioară</string>
+  <string name="description_camera_take_picture">Fotografiați</string>
+  <string name="description_camera_cancel_photo">Refaceți fotografia</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
index 9de3cabab..a165b72ee 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Переключиться в полноэкранный режим"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Переключиться в режим предварительного просмотра"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Переключиться на фронтальную камеру"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Переключиться на основную камеру"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сделать снимок"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Новый снимок"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Переключиться в полноэкранный режим</string>
+  <string name="description_camera_switch_preview_screen">Переключиться в режим предварительного просмотра</string>
+  <string name="description_camera_switch_camera_facing">Переключиться на фронтальную камеру</string>
+  <string name="description_camera_switch_camera_rear">Переключиться на основную камеру</string>
+  <string name="description_camera_take_picture">Сделать снимок</string>
+  <string name="description_camera_cancel_photo">Новый снимок</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
index 1747d1a37..9df3f72f7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"කැමරා පෙරදසුන වෙත මාරුවීම"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ඡායාරූපය ගැනීම"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ඡායාරූපය නැවත ගැනීම"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">පූර්ණ තිර කැමරාව වෙත මාරුවීම</string>
+  <string name="description_camera_switch_preview_screen">කැමරා පෙරදසුන වෙත මාරුවීම</string>
+  <string name="description_camera_switch_camera_facing">ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම</string>
+  <string name="description_camera_switch_camera_rear">පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම</string>
+  <string name="description_camera_take_picture">ඡායාරූපය ගැනීම</string>
+  <string name="description_camera_cancel_photo">ඡායාරූපය නැවත ගැනීම</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
index a053e2f3b..f22e97334 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Prepnúť na fotoaparát na celej obrazovke"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prepnúť na ukážku z fotoaparátu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prepnúť na predný fotoaparát"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prepnúť na zadný fotoaparát"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Odfotiť"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova odfotiť"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prepnúť na fotoaparát na celej obrazovke</string>
+  <string name="description_camera_switch_preview_screen">Prepnúť na ukážku z fotoaparátu</string>
+  <string name="description_camera_switch_camera_facing">Prepnúť na predný fotoaparát</string>
+  <string name="description_camera_switch_camera_rear">Prepnúť na zadný fotoaparát</string>
+  <string name="description_camera_take_picture">Odfotiť</string>
+  <string name="description_camera_cancel_photo">Znova odfotiť</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
index b50aaaea9..8c48877be 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Preklopi v celozaslonski način fotoaparata"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Preklopi v predogled fotoaparata"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Preklopi na fotoaparat na sprednji strani"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Preklopi na fotoaparat na zadnji strani"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Posnemi fotografijo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova posnemi fotografijo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Preklopi v celozaslonski način fotoaparata</string>
+  <string name="description_camera_switch_preview_screen">Preklopi v predogled fotoaparata</string>
+  <string name="description_camera_switch_camera_facing">Preklopi na fotoaparat na sprednji strani</string>
+  <string name="description_camera_switch_camera_rear">Preklopi na fotoaparat na zadnji strani</string>
+  <string name="description_camera_take_picture">Posnemi fotografijo</string>
+  <string name="description_camera_cancel_photo">Znova posnemi fotografijo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
index 4be0317dc..e5c7e8450 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Kalo në kamerën me ekran të plotë"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kalo te pamja paraprake e kamerës"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Kalo te kamera e përparme"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Kalo te kamera e pasme"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Bëj një fotografi"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Bëje përsëri fotografinë"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Kalo në kamerën me ekran të plotë</string>
+  <string name="description_camera_switch_preview_screen">Kalo te pamja paraprake e kamerës</string>
+  <string name="description_camera_switch_camera_facing">Kalo te kamera e përparme</string>
+  <string name="description_camera_switch_camera_rear">Kalo te kamera e pasme</string>
+  <string name="description_camera_take_picture">Bëj një fotografi</string>
+  <string name="description_camera_cancel_photo">Bëje përsëri fotografinë</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
index 4afcbe914..d59207084 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Пребаците на приказ камере преко целог екрана"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пребаците на преглед камере"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пребаците на предњу камеру"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пребаците на задњу камеру"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимите слику"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Поново снимите слику"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Пребаците на приказ камере преко целог екрана</string>
+  <string name="description_camera_switch_preview_screen">Пребаците на преглед камере</string>
+  <string name="description_camera_switch_camera_facing">Пребаците на предњу камеру</string>
+  <string name="description_camera_switch_camera_rear">Пребаците на задњу камеру</string>
+  <string name="description_camera_take_picture">Снимите слику</string>
+  <string name="description_camera_cancel_photo">Поново снимите слику</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
index 8bd00ccd9..b65d9f7ed 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Växla till helskärmskamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Växla till förhandsgranskning i kameran"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Växla till den framåtvända kameran"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Växla till den bakåtvända kameran"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta en bild"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta en ny bild"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Växla till helskärmskamera</string>
+  <string name="description_camera_switch_preview_screen">Växla till förhandsgranskning i kameran</string>
+  <string name="description_camera_switch_camera_facing">Växla till den framåtvända kameran</string>
+  <string name="description_camera_switch_camera_rear">Växla till den bakåtvända kameran</string>
+  <string name="description_camera_take_picture">Ta en bild</string>
+  <string name="description_camera_cancel_photo">Ta en ny bild</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
index c951ac6a2..cb2a3f725 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Badili utumie kamera ya skrini nzima"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Badili utumie onyesha la kuchungulia la kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Badili utumie kamera ya mbele"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Badili utumie kamera ya nyuma"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Piga picha"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Piga picha tena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Badili utumie kamera ya skrini nzima</string>
+  <string name="description_camera_switch_preview_screen">Badili utumie onyesha la kuchungulia la kamera</string>
+  <string name="description_camera_switch_camera_facing">Badili utumie kamera ya mbele</string>
+  <string name="description_camera_switch_camera_rear">Badili utumie kamera ya nyuma</string>
+  <string name="description_camera_take_picture">Piga picha</string>
+  <string name="description_camera_cancel_photo">Piga picha tena</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
index 374cfcfe2..84b281d8e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"முன்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"பின்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"படமெடுக்கும் பொத்தான்"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"மீண்டும் படமெடுக்கும் பொத்தான்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_switch_preview_screen">கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_switch_camera_facing">முன்பக்க கேமராவிற்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_switch_camera_rear">பின்பக்க கேமராவிற்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_take_picture">படமெடுக்கும் பொத்தான்</string>
+  <string name="description_camera_cancel_photo">மீண்டும் படமெடுக்கும் பொத்தான்</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
index 099fa67a7..0890b162c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"కెమెరా పరిదృశ్యానికి మారుస్తుంది"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ముందువైపు కెమెరాకు మారుస్తుంది"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"వెనుకవైపు కెమెరాకు మారుస్తుంది"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ఫోటో తీస్తుంది"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ఫోటోను మళ్లీ తీస్తుంది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది</string>
+  <string name="description_camera_switch_preview_screen">కెమెరా పరిదృశ్యానికి మారుస్తుంది</string>
+  <string name="description_camera_switch_camera_facing">ముందువైపు కెమెరాకు మారుస్తుంది</string>
+  <string name="description_camera_switch_camera_rear">వెనుకవైపు కెమెరాకు మారుస్తుంది</string>
+  <string name="description_camera_take_picture">ఫోటో తీస్తుంది</string>
+  <string name="description_camera_cancel_photo">ఫోటోను మళ్లీ తీస్తుంది</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
index 62c69a3e5..f86dc9e19 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"เปลี่ยนเป็นกล้องหน้า"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"เปลี่ยนเป็นกล้องหลัง"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ถ่ายภาพ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ถ่ายภาพอีกครั้ง"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ</string>
+  <string name="description_camera_switch_preview_screen">เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง</string>
+  <string name="description_camera_switch_camera_facing">เปลี่ยนเป็นกล้องหน้า</string>
+  <string name="description_camera_switch_camera_rear">เปลี่ยนเป็นกล้องหลัง</string>
+  <string name="description_camera_take_picture">ถ่ายภาพ</string>
+  <string name="description_camera_cancel_photo">ถ่ายภาพอีกครั้ง</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
index 2f6fb83c3..bce0d0a7c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Lumipat sa camera na full screen"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Lumipat sa preview ng camera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Lumipat sa camera na nasa harap"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Lumipat sa camera na nasa likod"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Kumuha ng larawan"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Kunang muli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Lumipat sa camera na full screen</string>
+  <string name="description_camera_switch_preview_screen">Lumipat sa preview ng camera</string>
+  <string name="description_camera_switch_camera_facing">Lumipat sa camera na nasa harap</string>
+  <string name="description_camera_switch_camera_rear">Lumipat sa camera na nasa likod</string>
+  <string name="description_camera_take_picture">Kumuha ng larawan</string>
+  <string name="description_camera_cancel_photo">Kunang muli</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
index da54ac88d..80aee306e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekran kameraya geçer"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizlemesine geçer"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya geçer"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arka kameraya geçer"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotoğraf çeker"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotoğrafı yeniden çeker"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Tam ekran kameraya geçer</string>
+  <string name="description_camera_switch_preview_screen">Kamera önizlemesine geçer</string>
+  <string name="description_camera_switch_camera_facing">Ön kameraya geçer</string>
+  <string name="description_camera_switch_camera_rear">Arka kameraya geçer</string>
+  <string name="description_camera_take_picture">Fotoğraf çeker</string>
+  <string name="description_camera_cancel_photo">Fotoğrafı yeniden çeker</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
index cea540a9e..2c22eacde 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Показ зображення з камери на весь екран"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Попередній перегляд зображення з камери"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Перейти до фронтальної камери"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Перейти до задньої камери"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зробити фото"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зробити фото ще раз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Показ зображення з камери на весь екран</string>
+  <string name="description_camera_switch_preview_screen">Попередній перегляд зображення з камери</string>
+  <string name="description_camera_switch_camera_facing">Перейти до фронтальної камери</string>
+  <string name="description_camera_switch_camera_rear">Перейти до задньої камери</string>
+  <string name="description_camera_take_picture">Зробити фото</string>
+  <string name="description_camera_cancel_photo">Зробити фото ще раз</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
index 585a55a03..5c96d6a41 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"کیمرہ پیش منظر پر سوئچ کریں"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"فرنٹ والے کیمرے پر سوئچ کریں"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"عقب والے کیمرے پر سوئچ کریں"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"تصویر لیں"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"دوبارہ تصویر لیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">پوری اسکرین کے کیمرہ پر سوئچ کریں</string>
+  <string name="description_camera_switch_preview_screen">کیمرہ پیش منظر پر سوئچ کریں</string>
+  <string name="description_camera_switch_camera_facing">فرنٹ والے کیمرے پر سوئچ کریں</string>
+  <string name="description_camera_switch_camera_rear">عقب والے کیمرے پر سوئچ کریں</string>
+  <string name="description_camera_take_picture">تصویر لیں</string>
+  <string name="description_camera_cancel_photo">دوبارہ تصویر لیں</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
index 8441d887c..4341ae5bd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"To‘liq ekranli rejimga o‘tish"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Oldindan ko‘rish rejimiga o‘tish"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Old kamerani yoqish"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Orqa kamerani yoqish"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Rasmga olish"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Yangi rasmga olish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">To‘liq ekranli rejimga o‘tish</string>
+  <string name="description_camera_switch_preview_screen">Razm solish rejimiga o‘tish</string>
+  <string name="description_camera_switch_camera_facing">Old kamerani yoqish</string>
+  <string name="description_camera_switch_camera_rear">Orqa kamerani yoqish</string>
+  <string name="description_camera_take_picture">Rasmga olish</string>
+  <string name="description_camera_cancel_photo">Yangi rasmga olish</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
index 054666455..9c89d8b4c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Chuyển sang máy ảnh toàn màn hình"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Chuyển sang chế độ xem trước máy ảnh"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Chuyển sang máy ảnh mặt trước"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Chuyển sang máy ảnh mặt sau"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Chụp ảnh"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Chụp lại ảnh"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Chuyển sang máy ảnh toàn màn hình</string>
+  <string name="description_camera_switch_preview_screen">Chuyển sang chế độ xem trước máy ảnh</string>
+  <string name="description_camera_switch_camera_facing">Chuyển sang máy ảnh mặt trước</string>
+  <string name="description_camera_switch_camera_rear">Chuyển sang máy ảnh mặt sau</string>
+  <string name="description_camera_take_picture">Chụp ảnh</string>
+  <string name="description_camera_cancel_photo">Chụp lại ảnh</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
index 24e9c1a63..b44f4303a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"切换到全屏相机模式"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切换到相机预览模式"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切换到前置摄像头"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切换到后置摄像头"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重拍照片"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">切换到全屏相机模式</string>
+  <string name="description_camera_switch_preview_screen">切换到相机预览模式</string>
+  <string name="description_camera_switch_camera_facing">切换到前置摄像头</string>
+  <string name="description_camera_switch_camera_rear">切换到后置摄像头</string>
+  <string name="description_camera_take_picture">拍照</string>
+  <string name="description_camera_cancel_photo">重拍照片</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
index 0310b10e6..393c45f7a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">切換至全螢幕相機</string>
+  <string name="description_camera_switch_preview_screen">切換至相機預覽</string>
+  <string name="description_camera_switch_camera_facing">切換至前置鏡頭</string>
+  <string name="description_camera_switch_camera_rear">切換至後置鏡頭</string>
+  <string name="description_camera_take_picture">拍照</string>
+  <string name="description_camera_cancel_photo">重新拍照</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
index d41ddda25..5cd51ee2f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽畫面"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">切換至全螢幕相機</string>
+  <string name="description_camera_switch_preview_screen">切換至相機預覽畫面</string>
+  <string name="description_camera_switch_camera_facing">切換至前置鏡頭</string>
+  <string name="description_camera_switch_camera_rear">切換至後置鏡頭</string>
+  <string name="description_camera_take_picture">拍照</string>
+  <string name="description_camera_cancel_photo">重新拍照</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
index 6e147b7f9..0c6dafc17 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
@@ -1,26 +1,9 @@
-<?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="description_camera_switch_full_screen" msgid="835509743097428216">"Shintshela kukhamera yesikrini esigcwele"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Shintshela ekuhloleni kuqala kwekhamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Shintshela kwikhamera yangaphambili"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Shintshela kwikhamera ebheke emuva"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Thatha isithombe"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Thatha kabusha isithombe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Shintshela kukhamera yesikrini esigcwele</string>
+  <string name="description_camera_switch_preview_screen">Shintshela ekuhloleni kuqala kwekhamera</string>
+  <string name="description_camera_switch_camera_facing">Shintshela kwikhamera yangaphambili</string>
+  <string name="description_camera_switch_camera_rear">Shintshela kwikhamera ebheke emuva</string>
+  <string name="description_camera_take_picture">Thatha isithombe</string>
+  <string name="description_camera_cancel_photo">Thatha kabusha isithombe</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
index fd7cd5b7b..ad84a0bcd 100644
--- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Dringend! Antwoord asseblief!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Wil jy klets?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Vinnige vragie …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skryf \'n gepasmaakte boodskap"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Stuur en bel"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Deel en bel"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"prent <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"prent"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kon nie kameraprent laai nie"</string>
-    <string name="allow" msgid="8637148297403066623">"Laat toe"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot kamera om \'n foto te neem"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot media om \'n prent te deel"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Neem \'n foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Kies \'n foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Stuur \'n boodskap"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto is via Boodskappe gestuur"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Boodskap is via Boodskappe gestuur"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Stuur tans prent …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Dringend! Antwoord asseblief!</string>
+  <string name="want_to_chat">Wil jy klets?</string>
+  <string name="quick_question">Vinnige vragie …</string>
+  <string name="message_composer_custom_message_hint">Skryf \'n gepasmaakte boodskap</string>
+  <string name="send_and_call">Stuur en bel</string>
+  <string name="share_and_call">Deel en bel</string>
+  <string name="gallery_item_description">prent %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">prent</string>
+  <string name="camera_media_failure">Kon nie kameraprent laai nie</string>
+  <string name="allow">Laat toe</string>
+  <string name="camera_permission_text">Verleen toegang tot kamera om \'n foto te neem</string>
+  <string name="gallery_permission_text">Verleen toegang tot media om \'n prent te deel</string>
+  <string name="description_call_composer_camera">Neem \'n foto</string>
+  <string name="description_call_composer_photo">Kies \'n foto</string>
+  <string name="description_call_composer_message">Stuur \'n boodskap</string>
+  <string name="image_sent_messages">Foto is via Boodskappe gestuur</string>
+  <string name="message_sent_messages">Boodskap is via Boodskappe gestuur</string>
+  <string name="call_composer_image_uploading">Stuur tans prent …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
index b41210953..2e76b6e95 100644
--- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"አስቸኳይ! እባክዎ ያንሱ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ለመወያየት ይፈልጋሉ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ፈጣን ጥያቄ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ብጁ መልዕክት ይጻፉ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ይላኩ እንዲሁም ይደውሉ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ያጋሩ እና ይደውሉ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ምስል <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ምስል"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"የካሜራ ምስልን መጫን አልተቻለም"</string>
-    <string name="allow" msgid="8637148297403066623">"ፍቀድ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ፎቶ ያንሱ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ፎቶ ይምረጡ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"መልዕክት ይላኩ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ፎቶ በመልዕክቶች በኩል ተልኳል"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"መልዕክት በመልዕክቶች በኩል ተልኳል"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ምስል በመላክ ላይ…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">አስቸኳይ! እባክዎ ያንሱ!</string>
+  <string name="want_to_chat">ለመወያየት ይፈልጋሉ?</string>
+  <string name="quick_question">ፈጣን ጥያቄ…</string>
+  <string name="message_composer_custom_message_hint">ብጁ መልዕክት ይጻፉ</string>
+  <string name="send_and_call">ይላኩ እንዲሁም ይደውሉ</string>
+  <string name="share_and_call">ያጋሩ እና ይደውሉ</string>
+  <string name="gallery_item_description">ምስል %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ምስል</string>
+  <string name="camera_media_failure">የካሜራ ምስልን መጫን አልተቻለም</string>
+  <string name="allow">ፍቀድ</string>
+  <string name="camera_permission_text">ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ</string>
+  <string name="gallery_permission_text">አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ</string>
+  <string name="description_call_composer_camera">ፎቶ ያንሱ</string>
+  <string name="description_call_composer_photo">ፎቶ ይምረጡ</string>
+  <string name="description_call_composer_message">መልዕክት ይላኩ</string>
+  <string name="image_sent_messages">ፎቶ በመልዕክቶች በኩል ተልኳል</string>
+  <string name="message_sent_messages">መልዕክት በመልዕክቶች በኩል ተልኳል</string>
+  <string name="call_composer_image_uploading">ምስል በመላክ ላይ…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
index ee811bdd5..bff15c533 100644
--- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"عاجل! يُرجى الرد!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"هل تريد الدردشة؟"</string>
-    <string name="quick_question" msgid="3501160802390214092">"سؤال سريع…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"كتابة رسالة مخصصة"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"الإرسال والاتصال"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"المشاركة والاتصال"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"الصورة <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"صورة"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"يتعذر تحميل صورة الكاميرا"</string>
-    <string name="allow" msgid="8637148297403066623">"سماح"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"التقاط صورة"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"اختيار صورة"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"إرسال رسالة"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"‏صورة مرسلة عبر Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"‏رسالة مرسلة عبر Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"جارٍ إرسال الصورة..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">عاجل! يُرجى الرد!</string>
+  <string name="want_to_chat">هل تريد المحادثة؟</string>
+  <string name="quick_question">سؤال سريع…</string>
+  <string name="message_composer_custom_message_hint">كتابة رسالة مخصصة</string>
+  <string name="send_and_call">الإرسال والاتصال</string>
+  <string name="share_and_call">المشاركة والاتصال</string>
+  <string name="gallery_item_description">الصورة %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">صورة</string>
+  <string name="camera_media_failure">يتعذر تحميل صورة الكاميرا</string>
+  <string name="allow">سماح</string>
+  <string name="camera_permission_text">لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا</string>
+  <string name="gallery_permission_text">لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط</string>
+  <string name="description_call_composer_camera">التقاط صورة</string>
+  <string name="description_call_composer_photo">اختيار صورة</string>
+  <string name="description_call_composer_message">إرسال رسالة</string>
+  <string name="image_sent_messages">‏صورة مرسلة عبر Messages</string>
+  <string name="message_sent_messages">‏رسالة مرسلة عبر Messages</string>
+  <string name="call_composer_image_uploading">جارٍ إرسال الصورة...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
index 2d1a26c5a..d1629a41d 100644
--- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Təcili! Lütfən, götürün!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Söhbət etmək istəyirsiniz?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Tez sual..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Fərdi mesaj yazın"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Göndərin və zəng edin"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Paylaşın və zəng edin"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"şəkil <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"şəkil"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamera şəklini yükləmək olmur"</string>
-    <string name="allow" msgid="8637148297403066623">"İcazə verin"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Şəkil çəkmək üçün kameraya giriş icazəsi verin"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Şəkil çəkin"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto seçin"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj göndərin"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto Mesajlaşma tətbiqi vasitəsilə göndərildi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Şəkil göndərilir..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Təcili! Lütfən, götürün!</string>
+  <string name="want_to_chat">Söhbət etmək istəyirsiniz?</string>
+  <string name="quick_question">Tez sual...</string>
+  <string name="message_composer_custom_message_hint">Fərdi mesaj yazın</string>
+  <string name="send_and_call">Göndərin və zəng edin</string>
+  <string name="share_and_call">Paylaşın və zəng edin</string>
+  <string name="gallery_item_description">şəkil %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">şəkil</string>
+  <string name="camera_media_failure">Kamera şəklini yükləmək olmur</string>
+  <string name="allow">İcazə verin</string>
+  <string name="camera_permission_text">Şəkil çəkmək üçün kameraya giriş icazəsi verin</string>
+  <string name="gallery_permission_text">Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin</string>
+  <string name="description_call_composer_camera">Şəkil çəkin</string>
+  <string name="description_call_composer_photo">Foto seçin</string>
+  <string name="description_call_composer_message">Mesaj göndərin</string>
+  <string name="image_sent_messages">Foto Mesajlaşma tətbiqi vasitəsilə göndərildi</string>
+  <string name="message_sent_messages">Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi</string>
+  <string name="call_composer_image_uploading">Şəkil göndərilir...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
index fbe93d2d5..cb2516023 100644
--- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Hitno je! Javi se!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želiš da ćaskaš?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kratko pitanje…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite prilagođenu poruku"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Pošalji i pozovi"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Deli i pozovi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Učitavanje slike sa kamere nije uspelo"</string>
-    <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Odobrite pristup Kameri da biste snimili sliku"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Odobrite pristup Medijima da biste delili sliku"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Slikajte"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberite sliku"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošaljite poruku"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Slika je poslata preko Messages-a"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslata preko Messages-a"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Šalje se slika…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Hitno je! Javi se!</string>
+  <string name="want_to_chat">Želiš da ćaskaš?</string>
+  <string name="quick_question">Kratko pitanje…</string>
+  <string name="message_composer_custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="send_and_call">Pošalji i pozovi</string>
+  <string name="share_and_call">Deli i pozovi</string>
+  <string name="gallery_item_description">slika, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Učitavanje slike sa kamere nije uspelo</string>
+  <string name="allow">Dozvoli</string>
+  <string name="camera_permission_text">Odobrite pristup Kameri da biste snimili sliku</string>
+  <string name="gallery_permission_text">Odobrite pristup Medijima da biste delili sliku</string>
+  <string name="description_call_composer_camera">Slikajte</string>
+  <string name="description_call_composer_photo">Izaberite sliku</string>
+  <string name="description_call_composer_message">Pošaljite poruku</string>
+  <string name="image_sent_messages">Slika je poslata preko Messages-a</string>
+  <string name="message_sent_messages">Poruka je poslata preko Messages-a</string>
+  <string name="call_composer_image_uploading">Šalje se slika…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
index 5197f714e..2abe02b0a 100644
--- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Тэрмінова! Падніміце слухаўку!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Хочаце паразмаўляць у чаце?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Хуткае пытанне…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напісаць карыстальніцкае паведамленне"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Адправіць і пазваніць"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Абагуліць і выклікаць"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"відарыс <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"відарыс"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не ўдалося загрузіць відарыс з камеры"</string>
-    <string name="allow" msgid="8637148297403066623">"Дазволіць"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Каб зрабіць фота, адкрыйце доступ да Камеры"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Зрабіць фота"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбраць фота"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Адправіць паведамленне"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фота адпраўлена праз праграму \"Паведамленні\""</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Паведамленне адпраўлена праз праграму \"Паведамленні\""</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Адпраўка відарыса..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Тэрмінова! Падніміце слухаўку!</string>
+  <string name="want_to_chat">Хочаце паразмаўляць у чаце?</string>
+  <string name="quick_question">Хуткае пытанне…</string>
+  <string name="message_composer_custom_message_hint">Напісаць карыстальніцкае паведамленне</string>
+  <string name="send_and_call">Адправіць і пазваніць</string>
+  <string name="share_and_call">Абагуліць і выклікаць</string>
+  <string name="gallery_item_description">відарыс %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">відарыс</string>
+  <string name="camera_media_failure">Не ўдалося загрузіць відарыс з камеры</string>
+  <string name="allow">Дазволіць</string>
+  <string name="camera_permission_text">Каб зрабіць фота, адкрыйце доступ да Камеры</string>
+  <string name="gallery_permission_text">Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў</string>
+  <string name="description_call_composer_camera">Зрабіць фота</string>
+  <string name="description_call_composer_photo">Выбраць фота</string>
+  <string name="description_call_composer_message">Адправіць паведамленне</string>
+  <string name="image_sent_messages">Фота адпраўлена праз праграму \"Паведамленні\"</string>
+  <string name="message_sent_messages">Паведамленне адпраўлена праз праграму \"Паведамленні\"</string>
+  <string name="call_composer_image_uploading">Адпраўка відарыса...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
index 7b431ce4e..c79e534f3 100644
--- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Спешно! Моля, вдигнете!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Искате да разговаряте?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Кратък въпрос…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напишете свое съобщение"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Изпращане и обаждане"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Споделяне и обаждане"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"изображение от <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"изображение"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Изображението от камерата не можа да се зареди"</string>
-    <string name="allow" msgid="8637148297403066623">"Разрешаване"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"За да направите снимка, разрешете достъп до Камера"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите изображение, разрешете достъп до Медии"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Правене на снимка"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Избиране на снимка"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Изпращане на съобщение"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Снимката е изпратена чрез Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Съобщението е изпратено чрез Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Изображението се изпраща…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Спешно! Моля, вдигнете!</string>
+  <string name="want_to_chat">Искате да разговаряте?</string>
+  <string name="quick_question">Кратък въпрос…</string>
+  <string name="message_composer_custom_message_hint">Напишете свое съобщение</string>
+  <string name="send_and_call">Изпращане и обаждане</string>
+  <string name="share_and_call">Споделяне и обаждане</string>
+  <string name="gallery_item_description">изображение от %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">изображение</string>
+  <string name="camera_media_failure">Изображението от камерата не можа да се зареди</string>
+  <string name="allow">Разрешаване</string>
+  <string name="camera_permission_text">За да направите снимка, разрешете достъп до Камера</string>
+  <string name="gallery_permission_text">За да споделите изображение, разрешете достъп до Медии</string>
+  <string name="description_call_composer_camera">Правене на снимка</string>
+  <string name="description_call_composer_photo">Избиране на снимка</string>
+  <string name="description_call_composer_message">Изпращане на съобщение</string>
+  <string name="image_sent_messages">Снимката е изпратена чрез Messages</string>
+  <string name="message_sent_messages">Съобщението е изпратено чрез Messages</string>
+  <string name="call_composer_image_uploading">Изображението се изпраща…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
index 17559b40c..5855304bd 100644
--- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"জরুরী! অনুগ্রহ করে কলটি ধরুন!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"চ্যাট করতে চান?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"দ্রুত প্রশ্ন…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"একটি কাস্টম বার্তা লিখুন"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"পাঠান এবং কল করুন"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"শেয়ার এবং কল করুন"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ছবি <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ছবি"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ক্যামেরার ছবি লোড করা গেল না"</string>
-    <string name="allow" msgid="8637148297403066623">"অনুমতি দিন"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"একটি ছবি তুলুন"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"একটি ফটো বেছে নিন"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"একটি বার্তা পাঠান"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages এর সাহায্যে ফটো পাঠানো হয়েছে"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ফটো পাঠানো হচ্ছে…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">জরুরী! অনুগ্রহ করে কলটি ধরুন!</string>
+  <string name="want_to_chat">চ্যাট করতে চান?</string>
+  <string name="quick_question">দ্রুত প্রশ্ন…</string>
+  <string name="message_composer_custom_message_hint">একটি কাস্টম বার্তা লিখুন</string>
+  <string name="send_and_call">পাঠান এবং কল করুন</string>
+  <string name="share_and_call">শেয়ার এবং কল করুন</string>
+  <string name="gallery_item_description">ছবি %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ছবি</string>
+  <string name="camera_media_failure">ক্যামেরার ছবি লোড করা গেল না</string>
+  <string name="allow">অনুমতি দিন</string>
+  <string name="camera_permission_text">একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন</string>
+  <string name="gallery_permission_text">কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন</string>
+  <string name="description_call_composer_camera">একটি ছবি তুলুন</string>
+  <string name="description_call_composer_photo">একটি ফটো বেছে নিন</string>
+  <string name="description_call_composer_message">একটি বার্তা পাঠান</string>
+  <string name="image_sent_messages">Messages এর সাহায্যে ফটো পাঠানো হয়েছে</string>
+  <string name="message_sent_messages">Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে</string>
+  <string name="call_composer_image_uploading">ফটো পাঠানো হচ্ছে…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
index d486f94e1..bb8d1d7c2 100644
--- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Hitno! Javite se!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želite li razgovarati?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kratko pitanje…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite prilagođenu poruku"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Pošalji i pozovi"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Podijeli i pozovi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nije moguće učitati sliku s kamere"</string>
-    <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Da snimite fotografiju, dajte pristup Kameri"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Da podijelite sliku, dozvolite pristup Medijima"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Uslikaj"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je poslana putem aplikacije Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslana putem aplikacije Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Slanje slike…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Hitno! Javite se!</string>
+  <string name="want_to_chat">Želite li razgovarati?</string>
+  <string name="quick_question">Kratko pitanje…</string>
+  <string name="message_composer_custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="send_and_call">Pošalji i pozovi</string>
+  <string name="share_and_call">Dijeli i pozovi</string>
+  <string name="gallery_item_description">slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Nije moguće učitati sliku s kamere</string>
+  <string name="allow">Dozvoli</string>
+  <string name="camera_permission_text">Da snimite fotografiju, dajte pristup Kameri</string>
+  <string name="gallery_permission_text">Da podijelite sliku, dozvolite pristup Medijima</string>
+  <string name="description_call_composer_camera">Snimi fotografiju</string>
+  <string name="description_call_composer_photo">Odaberi fotografiju</string>
+  <string name="description_call_composer_message">Pošalji poruku</string>
+  <string name="image_sent_messages">Fotografija je poslana putem aplikacije Messages</string>
+  <string name="message_sent_messages">Poruka je poslana putem aplikacije Messages</string>
+  <string name="call_composer_image_uploading">Slanje slike…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
index 6b77b1836..7ee0b86b6 100644
--- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"És urgent! Respon!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vols xatejar?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Una pregunta ràpida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escriu un miss. personalitzat"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Envia i truca"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Comparteix i truca"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imatge del dia <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imatge"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"No s\'ha pogut carregar la imatge de la càmera"</string>
-    <string name="allow" msgid="8637148297403066623">"Permet"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Per fer una foto, dona accés a la càmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Per compartir una imatge, dona accés al contingut multimèdia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Fes una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Tria una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envia un missatge"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada mitjançant Missatges"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Missatge enviat mitjançant Missatges"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"S\'està enviant la imatge…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">És urgent! Respon!</string>
+  <string name="want_to_chat">Vols xatejar?</string>
+  <string name="quick_question">Una pregunta ràpida…</string>
+  <string name="message_composer_custom_message_hint">Escriu un miss. personalitzat</string>
+  <string name="send_and_call">Envia i truca</string>
+  <string name="share_and_call">Comparteix i truca</string>
+  <string name="gallery_item_description">imatge del dia %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imatge</string>
+  <string name="camera_media_failure">No s\'ha pogut carregar la imatge de la càmera</string>
+  <string name="allow">Permet</string>
+  <string name="camera_permission_text">Per fer una foto, dona accés a la càmera</string>
+  <string name="gallery_permission_text">Per compartir una imatge, dona accés al contingut multimèdia</string>
+  <string name="description_call_composer_camera">Fes una foto</string>
+  <string name="description_call_composer_photo">Tria una foto</string>
+  <string name="description_call_composer_message">Envia un missatge</string>
+  <string name="image_sent_messages">Foto enviada mitjançant Missatges</string>
+  <string name="message_sent_messages">Missatge enviat mitjançant Missatges</string>
+  <string name="call_composer_image_uploading">S\'està enviant la imatge…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
index 916953733..77ecb08af 100644
--- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Zvedni to prosím, je to naléhavé!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Nechceš si popovídat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Chci se jen na něco rychle zeptat…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napište vlastní zprávu"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Poslat a zavolat"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Sdílet a zavolat"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"obrázek <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"obrázek"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Obrázek z fotoaparátu se nepodařilo načíst"</string>
-    <string name="allow" msgid="8637148297403066623">"Povolit"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Chcete-li pořídit fotku, povolte přístup k fotoaparátu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pokud chcete sdílet fotku, povolte přístup k mediálním souborům"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Vyfotit"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrat fotku"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Poslat zprávu"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotka poslaná v aplikaci Zprávy"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Zpráva poslaná v aplikaci Zprávy"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Odesílání obrázku…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Zvedni to prosím, je to naléhavé!</string>
+  <string name="want_to_chat">Nechceš si popovídat?</string>
+  <string name="quick_question">Chci se jen na něco rychle zeptat…</string>
+  <string name="message_composer_custom_message_hint">Napište vlastní zprávu</string>
+  <string name="send_and_call">Poslat a zavolat</string>
+  <string name="share_and_call">Sdílet a zavolat</string>
+  <string name="gallery_item_description">obrázek %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">obrázek</string>
+  <string name="camera_media_failure">Obrázek z fotoaparátu se nepodařilo načíst</string>
+  <string name="allow">Povolit</string>
+  <string name="camera_permission_text">Chcete-li pořídit fotku, povolte přístup k fotoaparátu</string>
+  <string name="gallery_permission_text">Pokud chcete sdílet fotku, povolte přístup k mediálním souborům</string>
+  <string name="description_call_composer_camera">Vyfotit</string>
+  <string name="description_call_composer_photo">Vybrat fotku</string>
+  <string name="description_call_composer_message">Poslat zprávu</string>
+  <string name="image_sent_messages">Fotka poslaná v aplikaci Zprávy</string>
+  <string name="message_sent_messages">Zpráva poslaná v aplikaci Zprávy</string>
+  <string name="call_composer_image_uploading">Odesílání obrázku…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
index f720d5973..3299ee8a1 100644
--- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Det haster. Besvar opkaldet!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Har du lyst til at chatte?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Et hurtigt spørgsmål…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv en tilpasset besked"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send og ring"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"billede <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"billede"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamerabilledet kan ikke indlæses"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillad"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Du skal give adgang til kameraet for at tage et billede"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Du skal give adgang til medier for at dele et billede"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tag et billede"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vælg et billede"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en sms"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoet blev sendt via Beskeder"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Beskeden blev sendt via Beskeder"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Billedet sendes…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Det haster. Besvar opkaldet!</string>
+  <string name="want_to_chat">Har du lyst til at chatte?</string>
+  <string name="quick_question">Et hurtigt spørgsmål…</string>
+  <string name="message_composer_custom_message_hint">Skriv en tilpasset besked</string>
+  <string name="send_and_call">Send og ring</string>
+  <string name="share_and_call">Del og ring</string>
+  <string name="gallery_item_description">billede %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">billede</string>
+  <string name="camera_media_failure">Kamerabilledet kan ikke indlæses</string>
+  <string name="allow">Tillad</string>
+  <string name="camera_permission_text">Du skal give adgang til kameraet for at tage et billede</string>
+  <string name="gallery_permission_text">Du skal give adgang til medier for at dele et billede</string>
+  <string name="description_call_composer_camera">Tag et billede</string>
+  <string name="description_call_composer_photo">Vælg et billede</string>
+  <string name="description_call_composer_message">Send en sms</string>
+  <string name="image_sent_messages">Fotoet blev sendt via Beskeder</string>
+  <string name="message_sent_messages">Beskeden blev sendt via Beskeder</string>
+  <string name="call_composer_image_uploading">Billedet sendes…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
index 3f3767e6f..16f7f5b4e 100644
--- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Dringend! Bitte annehmen!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Möchtest du chatten?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kurze Frage…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Eigene Nachricht schreiben"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Senden und anrufen"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Teilen und anrufen"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"Bild: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"Bild"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamerabild konnte nicht geladen werden"</string>
-    <string name="allow" msgid="8637148297403066623">"Zulassen"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Bild aufnehmen"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto auswählen"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Nachricht senden"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto über Messages gesendet"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Nachricht über Messages gesendet."</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Bild wird gesendet…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Dringend! Bitte annehmen!</string>
+  <string name="want_to_chat">Möchtest du chatten?</string>
+  <string name="quick_question">Kurze Frage…</string>
+  <string name="message_composer_custom_message_hint">Eigene Nachricht schreiben</string>
+  <string name="send_and_call">Senden und anrufen</string>
+  <string name="share_and_call">Teilen und anrufen</string>
+  <string name="gallery_item_description">Bild: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">Bild</string>
+  <string name="camera_media_failure">Kamerabild konnte nicht geladen werden</string>
+  <string name="allow">Zulassen</string>
+  <string name="camera_permission_text">Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben.</string>
+  <string name="gallery_permission_text">Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben.</string>
+  <string name="description_call_composer_camera">Bild aufnehmen</string>
+  <string name="description_call_composer_photo">Foto auswählen</string>
+  <string name="description_call_composer_message">Nachricht senden</string>
+  <string name="image_sent_messages">Foto über Messages gesendet</string>
+  <string name="message_sent_messages">Nachricht über Messages gesendet.</string>
+  <string name="call_composer_image_uploading">Bild wird gesendet…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
index 9a8ed5d96..fcd658edc 100644
--- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Επείγον! Παρακαλώ απαντήστε!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Θέλετε να συζητήσετε;"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Γρήγορη ερώτηση…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Γράψτε ένα προσαρμ. μήνυμα"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Αποστολή και κλήση"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Κοινοποίηση και κλήση"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"εικόνα <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"εικόνα"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Δεν ήταν δυνατή η φόρτωση της εικόνας φωτογραφικής μηχανής"</string>
-    <string name="allow" msgid="8637148297403066623">"Να επιτρέπεται"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Λήψη φωτογραφίας"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Επιλογή φωτογραφίας"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Αποστολή μηνύματος"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Η φωτογραφία στάλθηκε μέσω του Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Το μήνυμα στάλθηκε μέσω του Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Αποστολή εικόνας…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Επείγον! Παρακαλώ απαντήστε!</string>
+  <string name="want_to_chat">Θέλετε να συζητήσετε;</string>
+  <string name="quick_question">Γρήγορη ερώτηση…</string>
+  <string name="message_composer_custom_message_hint">Γράψτε ένα προσαρμ. μήνυμα</string>
+  <string name="send_and_call">Αποστολή και κλήση</string>
+  <string name="share_and_call">Κοινοποίηση και κλήση</string>
+  <string name="gallery_item_description">εικόνα %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">εικόνα</string>
+  <string name="camera_media_failure">Δεν ήταν δυνατή η φόρτωση της εικόνας φωτογραφικής μηχανής</string>
+  <string name="allow">Να επιτρέπεται</string>
+  <string name="camera_permission_text">Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα</string>
+  <string name="gallery_permission_text">Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα</string>
+  <string name="description_call_composer_camera">Λήψη φωτογραφίας</string>
+  <string name="description_call_composer_photo">Επιλογή φωτογραφίας</string>
+  <string name="description_call_composer_message">Αποστολή μηνύματος</string>
+  <string name="image_sent_messages">Η φωτογραφία στάλθηκε μέσω του Messages</string>
+  <string name="message_sent_messages">Το μήνυμα στάλθηκε μέσω του Messages</string>
+  <string name="call_composer_image_uploading">Αποστολή εικόνας…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
index 4e4edcfa9..d8007420b 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgent! Please answer!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Want to chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Quick question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Write a custom message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send and call"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
-    <string name="allow" msgid="8637148297403066623">"Allow"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Please answer!</string>
+  <string name="want_to_chat">Want to chat?</string>
+  <string name="quick_question">Quick question…</string>
+  <string name="message_composer_custom_message_hint">Write a custom message</string>
+  <string name="send_and_call">Send and call</string>
+  <string name="share_and_call">Share and call</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Couldn\'t load camera image</string>
+  <string name="allow">Allow</string>
+  <string name="camera_permission_text">To take a photo, give access to Camera</string>
+  <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <string name="description_call_composer_camera">Take a picture</string>
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <string name="description_call_composer_message">Sending a message</string>
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <string name="call_composer_image_uploading">Sending image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
index 4e4edcfa9..d8007420b 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgent! Please answer!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Want to chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Quick question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Write a custom message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send and call"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
-    <string name="allow" msgid="8637148297403066623">"Allow"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Please answer!</string>
+  <string name="want_to_chat">Want to chat?</string>
+  <string name="quick_question">Quick question…</string>
+  <string name="message_composer_custom_message_hint">Write a custom message</string>
+  <string name="send_and_call">Send and call</string>
+  <string name="share_and_call">Share and call</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Couldn\'t load camera image</string>
+  <string name="allow">Allow</string>
+  <string name="camera_permission_text">To take a photo, give access to Camera</string>
+  <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <string name="description_call_composer_camera">Take a picture</string>
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <string name="description_call_composer_message">Sending a message</string>
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <string name="call_composer_image_uploading">Sending image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
index 4e4edcfa9..d8007420b 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgent! Please answer!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Want to chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Quick question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Write a custom message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send and call"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
-    <string name="allow" msgid="8637148297403066623">"Allow"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Please answer!</string>
+  <string name="want_to_chat">Want to chat?</string>
+  <string name="quick_question">Quick question…</string>
+  <string name="message_composer_custom_message_hint">Write a custom message</string>
+  <string name="send_and_call">Send and call</string>
+  <string name="share_and_call">Share and call</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Couldn\'t load camera image</string>
+  <string name="allow">Allow</string>
+  <string name="camera_permission_text">To take a photo, give access to Camera</string>
+  <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <string name="description_call_composer_camera">Take a picture</string>
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <string name="description_call_composer_message">Sending a message</string>
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <string name="call_composer_image_uploading">Sending image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
index f06f5f03e..9918be878 100644
--- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"¡Es urgente! ¡Contesta!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"¿Quieres chatear?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pregunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escribe tu propio mensaje"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar y llamar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartir y llamar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagen del <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagen"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"No se pudo cargar la imagen de la cámara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tomar una foto, permite el acceso a la cámara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tomar una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada por Mensajes"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje de texto enviado por Mensajes"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagen…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">¡Es urgente! ¡Contesta!</string>
+  <string name="want_to_chat">¿Quieres chatear?</string>
+  <string name="quick_question">Pregunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escribe tu propio mensaje</string>
+  <string name="send_and_call">Enviar y llamar</string>
+  <string name="share_and_call">Compartir y llamar</string>
+  <string name="gallery_item_description">imagen del %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagen</string>
+  <string name="camera_media_failure">No se pudo cargar la imagen de la cámara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tomar una foto, permite el acceso a la cámara</string>
+  <string name="gallery_permission_text">Para compartir una imagen, permite el acceso al contenido multimedia</string>
+  <string name="description_call_composer_camera">Tomar una foto</string>
+  <string name="description_call_composer_photo">Elegir una foto</string>
+  <string name="description_call_composer_message">Enviar un mensaje</string>
+  <string name="image_sent_messages">Foto enviada por Mensajes</string>
+  <string name="message_sent_messages">Mensaje de texto enviado por Mensajes</string>
+  <string name="call_composer_image_uploading">Enviando imagen…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
index a8b919502..d9f244408 100644
--- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Por favor, contesta. ¡Es urgente!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"¿Quieres chatear?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Una pregunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Mensaje personalizado"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar y llamar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartir y llamar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagen del <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagen"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"No se ha podido cargar la imagen de la cámara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para hacer una foto, permite el acceso a la cámara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Hacer una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensajes"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje enviado a través de Mensajes"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando la imagen…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Por favor, contesta. ¡Es urgente!</string>
+  <string name="want_to_chat">¿Quieres chatear?</string>
+  <string name="quick_question">Una pregunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Mensaje personalizado</string>
+  <string name="send_and_call">Enviar y llamar</string>
+  <string name="share_and_call">Compartir y llamar</string>
+  <string name="gallery_item_description">imagen del %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagen</string>
+  <string name="camera_media_failure">No se ha podido cargar la imagen de la cámara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para hacer una foto, permite el acceso a la cámara</string>
+  <string name="gallery_permission_text">Para compartir una imagen, permite el acceso al contenido multimedia</string>
+  <string name="description_call_composer_camera">Hacer una foto</string>
+  <string name="description_call_composer_photo">Elegir una foto</string>
+  <string name="description_call_composer_message">Enviar un mensaje</string>
+  <string name="image_sent_messages">Foto enviada a través de Mensajes</string>
+  <string name="message_sent_messages">Mensaje enviado a través de Mensajes</string>
+  <string name="call_composer_image_uploading">Enviando la imagen…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
index 24548fb23..29c908e95 100644
--- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Kiire! Võtke vastu!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Kas soovite vestelda?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kiire küsimus …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Kirjutage kohandatud sõnum"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Saatmine ja helistamine"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Jaga ja helista"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"pilt: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"pilt"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kaamera kujutist ei õnnestunud laadida"</string>
-    <string name="allow" msgid="8637148297403066623">"Luba"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Foto jäädvustamiseks lubage juurdepääs kaamerale"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pildi jagamiseks lubage juurdepääs meediale"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Pildistamine"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto valimine"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sõnumi saatmine"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto saadeti rakenduse Messages kaudu"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Sõnum saadeti rakenduse Messages kaudu"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Kujutise saatmine …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Kiire! Võtke vastu!</string>
+  <string name="want_to_chat">Kas soovite vestelda?</string>
+  <string name="quick_question">Kiire küsimus …</string>
+  <string name="message_composer_custom_message_hint">Kirjutage kohandatud sõnum</string>
+  <string name="send_and_call">Saatmine ja helistamine</string>
+  <string name="share_and_call">Jaga ja helista</string>
+  <string name="gallery_item_description">pilt: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">pilt</string>
+  <string name="camera_media_failure">Kaamera kujutist ei õnnestunud laadida</string>
+  <string name="allow">Luba</string>
+  <string name="camera_permission_text">Foto jäädvustamiseks lubage juurdepääs kaamerale</string>
+  <string name="gallery_permission_text">Pildi jagamiseks lubage juurdepääs meediale</string>
+  <string name="description_call_composer_camera">Pildistamine</string>
+  <string name="description_call_composer_photo">Foto valimine</string>
+  <string name="description_call_composer_message">Sõnumi saatmine</string>
+  <string name="image_sent_messages">Foto saadeti rakenduse Messages kaudu</string>
+  <string name="message_sent_messages">Sõnum saadeti rakenduse Messages kaudu</string>
+  <string name="call_composer_image_uploading">Kujutise saatmine …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
index 012c62c31..7ff937cdd 100644
--- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Premiazkoa! Erantzun ezazu!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Txateatu nahi duzu?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Galdera bizkorra…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Idatzi mezu bat"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Bidali eta deitu"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partekatu eta deitu"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"irudiaren data: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"irudia"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Ezin izan da kargatu kamerako irudia"</string>
-    <string name="allow" msgid="8637148297403066623">"Baimendu"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Argazkiak ateratzeko, eman kamera atzitzeko baimena"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Irudiak partekatzeko, eman multimedia-edukirako sarbidea"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Atera argazki bat"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Aukeratu argazki bat"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Bidali mezu bat"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Mezuak aplikazioaren bidez bidali da argazkia"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mezuak aplikazioaren bidez bidali da mezua"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Irudia bidaltzen…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Premiazkoa! Erantzun ezazu!</string>
+  <string name="want_to_chat">Txateatu nahi duzu?</string>
+  <string name="quick_question">Galdera bizkorra…</string>
+  <string name="message_composer_custom_message_hint">Idatzi mezu bat</string>
+  <string name="send_and_call">Bidali eta deitu</string>
+  <string name="share_and_call">Partekatu eta deitu</string>
+  <string name="gallery_item_description">irudiaren data: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">irudia</string>
+  <string name="camera_media_failure">Ezin izan da kargatu kamerako irudia</string>
+  <string name="allow">Baimendu</string>
+  <string name="camera_permission_text">Argazkiak ateratzeko, eman kamera atzitzeko baimena</string>
+  <string name="gallery_permission_text">Irudiak partekatzeko, eman multimedia-edukirako sarbidea</string>
+  <string name="description_call_composer_camera">Atera argazki bat</string>
+  <string name="description_call_composer_photo">Aukeratu argazki bat</string>
+  <string name="description_call_composer_message">Bidali mezu bat</string>
+  <string name="image_sent_messages">Mezuak aplikazioaren bidez bidali da argazkia</string>
+  <string name="message_sent_messages">Mezuak aplikazioaren bidez bidali da mezua</string>
+  <string name="call_composer_image_uploading">Irudia bidaltzen…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
index eb97796cd..a7d74f491 100644
--- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"فوری! لطفاً بردارید!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"می‌خواهید گپ بزنید؟"</string>
-    <string name="quick_question" msgid="3501160802390214092">"سؤال سریع..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"پیام سفارشی بنویسید"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ارسال و تماس"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"اشتراک‌گذاری و تماس"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"تصویر <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"تصویر"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"تصویر دوربین بار نشد"</string>
-    <string name="allow" msgid="8637148297403066623">"مجاز است"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"برای عکس گرفتن، به دوربین اجازه دسترسی بدهید"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"عکس گرفتن"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"انتخاب عکس"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ارسال پیام"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"عکس ارسال‌شده ازطریق «پیام‌ها»"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"پیام ارسال‌شده ازطریق «پیام‌ها»"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"درحال ارسال تصویر…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">فوری! لطفاً بردارید!</string>
+  <string name="want_to_chat">می‌خواهید گپ بزنید؟</string>
+  <string name="quick_question">سؤال سریع...</string>
+  <string name="message_composer_custom_message_hint">پیام سفارشی بنویسید</string>
+  <string name="send_and_call">ارسال و تماس</string>
+  <string name="share_and_call">اشتراک‌گذاری و تماس</string>
+  <string name="gallery_item_description">تصویر %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">تصویر</string>
+  <string name="camera_media_failure">تصویر دوربین بار نشد</string>
+  <string name="allow">مجاز است</string>
+  <string name="camera_permission_text">برای عکس گرفتن، به دوربین اجازه دسترسی بدهید</string>
+  <string name="gallery_permission_text">برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید</string>
+  <string name="description_call_composer_camera">عکس گرفتن</string>
+  <string name="description_call_composer_photo">انتخاب عکس</string>
+  <string name="description_call_composer_message">ارسال پیام</string>
+  <string name="image_sent_messages">عکس ارسال‌شده ازطریق «پیام‌ها»</string>
+  <string name="message_sent_messages">پیام ارسال‌شده ازطریق «پیام‌ها»</string>
+  <string name="call_composer_image_uploading">درحال ارسال تصویر…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
index 892bd969a..5dbe619d8 100644
--- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Tärkeää, vastaa!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Haluatko jutella?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Nopea kysymys…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Kirjoita oma viesti"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Lähetä ja soita"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Jaa ja soita"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"kuva (<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>)"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"kuva"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamerakuvan lataus epäonnistui."</string>
-    <string name="allow" msgid="8637148297403066623">"Salli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Jos haluat ottaa valokuvan, salli kameran käyttö."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Jos haluat jakaa kuvan, salli kuvien käyttö."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ota kuva"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Valitse kuva"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Lähetä viesti"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Kuva lähetettiin Messages-sovelluksen kautta"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Viesti lähetettiin Messages-sovelluksen kautta"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Lähetetään kuvaa…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Tärkeää, vastaa!</string>
+  <string name="want_to_chat">Haluatko jutella?</string>
+  <string name="quick_question">Nopea kysymys…</string>
+  <string name="message_composer_custom_message_hint">Kirjoita oma viesti</string>
+  <string name="send_and_call">Lähetä ja soita</string>
+  <string name="share_and_call">Jaa ja soita</string>
+  <string name="gallery_item_description">kuva (%1$tB %1$te %1$tY %1$tl %1$tM %1$tp)</string>
+  <string name="gallery_item_description_no_date">kuva</string>
+  <string name="camera_media_failure">Kamerakuvan lataus epäonnistui.</string>
+  <string name="allow">Salli</string>
+  <string name="camera_permission_text">Jos haluat ottaa valokuvan, salli kameran käyttö.</string>
+  <string name="gallery_permission_text">Jos haluat jakaa kuvan, salli kuvien käyttö.</string>
+  <string name="description_call_composer_camera">Ota kuva</string>
+  <string name="description_call_composer_photo">Valitse kuva</string>
+  <string name="description_call_composer_message">Lähetä viesti</string>
+  <string name="image_sent_messages">Kuva lähetettiin Messages-sovelluksen kautta</string>
+  <string name="message_sent_messages">Viesti lähetettiin Messages-sovelluksen kautta</string>
+  <string name="call_composer_image_uploading">Lähetetään kuvaa…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
index 000d6eb7a..cc1adb1c2 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgent! Veuillez répondre à l\'appel!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vous voulez clavarder?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Petite question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Rédiger message personnalisé"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Envoyer et appeler"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partager et appeler"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image : <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Impossible de charger l\'image de l\'appareil photo"</string>
-    <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, autorisez l\'accès à l\'appareil photo"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, autorisez l\'accès au contenu multimédia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée au moyen de l\'application Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé au moyen de l\'application Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Envoi de l\'image en cours…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Veuillez répondre à l\'appel!</string>
+  <string name="want_to_chat">Vous voulez clavarder?</string>
+  <string name="quick_question">Petite question…</string>
+  <string name="message_composer_custom_message_hint">Rédiger message personnalisé</string>
+  <string name="send_and_call">Envoyer et appeler</string>
+  <string name="share_and_call">Partager et appeler</string>
+  <string name="gallery_item_description">image : %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Impossible de charger l\'image de l\'appareil photo</string>
+  <string name="allow">Autoriser</string>
+  <string name="camera_permission_text">Pour prendre une photo, autorisez l\'accès à l\'appareil photo</string>
+  <string name="gallery_permission_text">Pour partager une image, autorisez l\'accès au contenu multimédia</string>
+  <string name="description_call_composer_camera">Prendre une photo</string>
+  <string name="description_call_composer_photo">Choisir une photo</string>
+  <string name="description_call_composer_message">Envoyer un message</string>
+  <string name="image_sent_messages">Photo envoyée au moyen de l\'application Messages</string>
+  <string name="message_sent_messages">Message envoyé au moyen de l\'application Messages</string>
+  <string name="call_composer_image_uploading">Envoi de l\'image en cours…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
index 40b89a367..1e6093c8f 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgent ! Veuillez décrocher, s\'il vous plaît !"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vous souhaitez participer au chat ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Petite question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Écrire mon propre message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Envoyer et appeler"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partager et appeler"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Impossible de charger l\'image de la caméra"</string>
-    <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, accordez l\'accès à l\'appareil photo."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, accordez l\'accès aux fichiers multimédia."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée via l\'application Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé via l\'application Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Envoi de l\'image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent ! Veuillez décrocher, s\'il vous plaît !</string>
+  <string name="want_to_chat">Vous souhaitez participer au chat ?</string>
+  <string name="quick_question">Petite question…</string>
+  <string name="message_composer_custom_message_hint">Écrire mon propre message</string>
+  <string name="send_and_call">Envoyer et appeler</string>
+  <string name="share_and_call">Partager et appeler</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Impossible de charger l\'image de la caméra</string>
+  <string name="allow">Autoriser</string>
+  <string name="camera_permission_text">Pour prendre une photo, accordez l\'accès à l\'appareil photo.</string>
+  <string name="gallery_permission_text">Pour partager une image, accordez l\'accès aux fichiers multimédia.</string>
+  <string name="description_call_composer_camera">Prendre une photo</string>
+  <string name="description_call_composer_photo">Choisir une photo</string>
+  <string name="description_call_composer_message">Envoyer un message</string>
+  <string name="image_sent_messages">Photo envoyée via l\'application Messages</string>
+  <string name="message_sent_messages">Message envoyé via l\'application Messages</string>
+  <string name="call_composer_image_uploading">Envoi de l\'image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
index 55bf5aa3c..dc034f214 100644
--- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"É urxente! Responde!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Queres chatear?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Unha pregunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escribe unha mensaxe personalizada"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e chamar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartir e chamar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"Imaxe do <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"Imaxe"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Non se puido cargar a imaxe da cámara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para sacar unha foto, concede permiso de acceso á cámara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tira unha foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolle unha foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envía unha mensaxe"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensaxes"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaxe enviada a través de Mensaxes"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imaxe…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">É urxente! Responde!</string>
+  <string name="want_to_chat">Queres chatear?</string>
+  <string name="quick_question">Unha pregunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escribe unha mensaxe personalizada</string>
+  <string name="send_and_call">Enviar e chamar</string>
+  <string name="share_and_call">Compartir e chamar</string>
+  <string name="gallery_item_description">Imaxe do %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">Imaxe</string>
+  <string name="camera_media_failure">Non se puido cargar a imaxe da cámara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para sacar unha foto, concede permiso de acceso á cámara</string>
+  <string name="gallery_permission_text">Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia</string>
+  <string name="description_call_composer_camera">Tira unha foto</string>
+  <string name="description_call_composer_photo">Escolle unha foto</string>
+  <string name="description_call_composer_message">Envía unha mensaxe</string>
+  <string name="image_sent_messages">Foto enviada a través de Mensaxes</string>
+  <string name="message_sent_messages">Mensaxe enviada a través de Mensaxes</string>
+  <string name="call_composer_image_uploading">Enviando imaxe…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
index 13f4c843d..0855cd981 100644
--- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"તાત્કાલિક! કૃપા કરીને ફોન ઉપાડો!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ચૅટ કરવી છે?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ઝડપી પ્રશ્ન…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"એક કસ્ટમ સંદેશ લખો"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"મોકલો અને કૉલ કરો"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"શેર કરો અને કૉલ કરો"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"છબી <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"છબી"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"કૅમેરા છબી લોડ કરી શકાઈ નથી"</string>
-    <string name="allow" msgid="8637148297403066623">"મંજૂરી આપો"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"એક ચિત્ર લો"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ફોટો પસંદ કરો"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"એક સંદેશ મોકલો"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages મારફતે ફોટો મોકલ્યો"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages મારફતે સંદેશ મોકલ્યો"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"છબી મોકલી રહ્યાં છીએ..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">તાત્કાલિક! કૃપા કરીને ફોન ઉપાડો!</string>
+  <string name="want_to_chat">ચૅટ કરવી છે?</string>
+  <string name="quick_question">ઝડપી પ્રશ્ન…</string>
+  <string name="message_composer_custom_message_hint">એક કસ્ટમ સંદેશ લખો</string>
+  <string name="send_and_call">મોકલો અને કૉલ કરો</string>
+  <string name="share_and_call">શેર કરો અને કૉલ કરો</string>
+  <string name="gallery_item_description">છબી %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">છબી</string>
+  <string name="camera_media_failure">કૅમેરા છબી લોડ કરી શકાઈ નથી</string>
+  <string name="allow">મંજૂરી આપો</string>
+  <string name="camera_permission_text">ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો</string>
+  <string name="gallery_permission_text">છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો</string>
+  <string name="description_call_composer_camera">એક ચિત્ર લો</string>
+  <string name="description_call_composer_photo">ફોટો પસંદ કરો</string>
+  <string name="description_call_composer_message">એક સંદેશ મોકલો</string>
+  <string name="image_sent_messages">Messages મારફતે ફોટો મોકલ્યો</string>
+  <string name="message_sent_messages">Messages મારફતે સંદેશ મોકલ્યો</string>
+  <string name="call_composer_image_uploading">છબી મોકલી રહ્યાં છીએ...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
index 5d39d0306..9da5df9bd 100644
--- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"अत्यावश्यक! कृपया जवाब दें!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"क्या आप चैट करना चाहते हैं?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"झटपट प्रश्न…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"कोई कस्टम संदेश लिखें"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"भेजें और कॉल करें"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"साझा करें और कॉल करें"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"चित्र <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"चित्र"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"कैमरे का चित्र लोड नहीं किया जा सका"</string>
-    <string name="allow" msgid="8637148297403066623">"अनुमति दें"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"चित्र साझा करने के लिए, मीडिया की ऐक्सेस दें"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"चित्र लें"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"एक फ़ोटो चुनें"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"संदेश भेजें"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"चित्र भेजा जा रहा है…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">अत्यावश्यक! कृपया जवाब दें!</string>
+  <string name="want_to_chat">क्या आप चैट करना चाहते हैं?</string>
+  <string name="quick_question">झटपट प्रश्न…</string>
+  <string name="message_composer_custom_message_hint">कोई कस्टम संदेश लिखें</string>
+  <string name="send_and_call">भेजें और कॉल करें</string>
+  <string name="share_and_call">शेयर करें और कॉल करें</string>
+  <string name="gallery_item_description">चित्र %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">चित्र</string>
+  <string name="camera_media_failure">कैमरे का चित्र लोड नहीं किया जा सका</string>
+  <string name="allow">अनुमति दें</string>
+  <string name="camera_permission_text">फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें</string>
+  <string name="gallery_permission_text">चित्र शेयर करने के लिए, मीडिया की ऐक्सेस दें</string>
+  <string name="description_call_composer_camera">चित्र लें</string>
+  <string name="description_call_composer_photo">एक फ़ोटो चुनें</string>
+  <string name="description_call_composer_message">संदेश भेजें</string>
+  <string name="image_sent_messages">संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया</string>
+  <string name="message_sent_messages">संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया</string>
+  <string name="call_composer_image_uploading">चित्र भेजा जा रहा है…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
index 551438845..424724423 100644
--- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Hitno! Javite se!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želite li se uključiti u chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Brzo pitanje…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite prilagođenu poruku"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Slanje i pozivanje"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Dijeli i pozovi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Slika se ne može učitati"</string>
-    <string name="allow" msgid="8637148297403066623">"Omogući"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Da biste snimili fotografiju, dopustite pristup Fotoaparatu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Za dijeljenje slike dopustite pristup Medijima"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Snimi fotografiju"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija poslana putem Poruka"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka poslana putem Poruka"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Slanje slike..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Hitno! Javite se!</string>
+  <string name="want_to_chat">Želite li se uključiti u chat?</string>
+  <string name="quick_question">Brzo pitanje…</string>
+  <string name="message_composer_custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="send_and_call">Slanje i pozivanje</string>
+  <string name="share_and_call">Dijeli i pozovi</string>
+  <string name="gallery_item_description">slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Slika se ne može učitati</string>
+  <string name="allow">Omogući</string>
+  <string name="camera_permission_text">Da biste snimili fotografiju, dopustite pristup Fotoaparatu</string>
+  <string name="gallery_permission_text">Za dijeljenje slike dopustite pristup Medijima</string>
+  <string name="description_call_composer_camera">Snimi fotografiju</string>
+  <string name="description_call_composer_photo">Odaberi fotografiju</string>
+  <string name="description_call_composer_message">Pošalji poruku</string>
+  <string name="image_sent_messages">Fotografija poslana putem Poruka</string>
+  <string name="message_sent_messages">Poruka poslana putem Poruka</string>
+  <string name="call_composer_image_uploading">Slanje slike...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
index caf7577b1..503795be3 100644
--- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Sürgős! Kérlek, vedd fel!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Szeretnél beszélgetni?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Gyors kérdés…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Egyéni üzenet írása"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Küldés és hívás"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Megosztás és hívás"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"kép: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"kép"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nem lehetett betölteni a kamera képét"</string>
-    <string name="allow" msgid="8637148297403066623">"Engedélyezés"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Fotó készítéséhez adjon hozzáférést a fényképezőgéphez"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Kép megosztásához adjon hozzáférést a médiafájlokhoz"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Kép készítése"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotó kiválasztása"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Üzenet küldése"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotó elküldve a Messages alkalmazásban"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Üzenet elküldve a Messages alkalmazásban"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Kép küldése…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Sürgős! Kérlek, vedd fel!</string>
+  <string name="want_to_chat">Szeretnél beszélgetni?</string>
+  <string name="quick_question">Gyors kérdés…</string>
+  <string name="message_composer_custom_message_hint">Egyéni üzenet írása</string>
+  <string name="send_and_call">Küldés és hívás</string>
+  <string name="share_and_call">Megosztás és hívás</string>
+  <string name="gallery_item_description">kép: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">kép</string>
+  <string name="camera_media_failure">Nem lehetett betölteni a kamera képét</string>
+  <string name="allow">Engedélyezés</string>
+  <string name="camera_permission_text">Fotó készítéséhez adjon hozzáférést a fényképezőgéphez</string>
+  <string name="gallery_permission_text">Kép megosztásához adjon hozzáférést a médiafájlokhoz</string>
+  <string name="description_call_composer_camera">Kép készítése</string>
+  <string name="description_call_composer_photo">Fotó kiválasztása</string>
+  <string name="description_call_composer_message">Üzenet küldése</string>
+  <string name="image_sent_messages">Fotó elküldve a Messages alkalmazásban</string>
+  <string name="message_sent_messages">Üzenet elküldve a Messages alkalmazásban</string>
+  <string name="call_composer_image_uploading">Kép küldése…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
index ae7e6add3..5dc7015a2 100644
--- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Շտա՛պ է: Խնդրում եմ պատասխանել:"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ուզո՞ւմ եք զրուցել:"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Արագ հարց…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Գրել տեքստն ինքնուրույն"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Ուղարկել և զանգել"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Կիսվել և զանգել"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"պատկեր <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"պատկեր"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Չհաջողվեց բեռնել տեսախցիկի պատկերը"</string>
-    <string name="allow" msgid="8637148297403066623">"Թույլատրել"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Լուսանկարել"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Ընտրել լուսանկար"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Ուղարկել հաղորդագրություն"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Լուսանկարն ուղարկվել է Messages-ի միջոցով"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Պատկերի ուղարկում…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Շտա՛պ է: Խնդրում եմ պատասխանել:</string>
+  <string name="want_to_chat">Ուզո՞ւմ եք զրուցել:</string>
+  <string name="quick_question">Արագ հարց…</string>
+  <string name="message_composer_custom_message_hint">Գրել տեքստն ինքնուրույն</string>
+  <string name="send_and_call">Ուղարկել և զանգել</string>
+  <string name="share_and_call">Կիսվել և զանգել</string>
+  <string name="gallery_item_description">պատկեր %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">պատկեր</string>
+  <string name="camera_media_failure">Չհաջողվեց բեռնել տեսախցիկի պատկերը</string>
+  <string name="allow">Թույլատրել</string>
+  <string name="camera_permission_text">Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն</string>
+  <string name="gallery_permission_text">Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն</string>
+  <string name="description_call_composer_camera">Լուսանկարել</string>
+  <string name="description_call_composer_photo">Ընտրել լուսանկար</string>
+  <string name="description_call_composer_message">Ուղարկել հաղորդագրություն</string>
+  <string name="image_sent_messages">Լուսանկարն ուղարկվել է Messages-ի միջոցով</string>
+  <string name="message_sent_messages">Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով</string>
+  <string name="call_composer_image_uploading">Պատկերի ուղարկում…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
index 3d3cba70c..c59c2e63f 100644
--- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Penting! Angkat teleponnya!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ingin chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pertanyaan cepat…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Tulis pesan khusus"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Kirim dan telepon"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Bagikan dan telepon"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"gambar <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"gambar"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Tidak dapat memuat gambar kamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Izinkan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses ke Kamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk membagikan gambar, berikan akses ke Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Jepret"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Mengirim pesan"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto dikirim lewat Message"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Pesan dikirim lewat Message"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Mengirim gambar…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Penting! Angkat teleponnya!</string>
+  <string name="want_to_chat">Ingin chat?</string>
+  <string name="quick_question">Pertanyaan cepat…</string>
+  <string name="message_composer_custom_message_hint">Tulis pesan khusus</string>
+  <string name="send_and_call">Kirim dan telepon</string>
+  <string name="share_and_call">Bagikan dan telepon</string>
+  <string name="gallery_item_description">gambar %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">gambar</string>
+  <string name="camera_media_failure">Tidak dapat memuat gambar kamera</string>
+  <string name="allow">Izinkan</string>
+  <string name="camera_permission_text">Untuk mengambil foto, berikan akses ke Kamera</string>
+  <string name="gallery_permission_text">Untuk membagikan gambar, berikan akses ke Media</string>
+  <string name="description_call_composer_camera">Jepret</string>
+  <string name="description_call_composer_photo">Pilih foto</string>
+  <string name="description_call_composer_message">Mengirim pesan</string>
+  <string name="image_sent_messages">Foto dikirim lewat Message</string>
+  <string name="message_sent_messages">Pesan dikirim lewat Message</string>
+  <string name="call_composer_image_uploading">Mengirim gambar…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
index ae3e12364..be63f0c56 100644
--- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Áríðandi! Svaraðu endilega!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Viltu spjalla?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Snögg spurning..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skrifa sérsniðin skilaboð"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Senda og hringja"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Deila og hringja"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"mynd <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"mynd"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Ekki var hægt að hlaða mynd frá myndavél"</string>
-    <string name="allow" msgid="8637148297403066623">"Leyfa"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Til að taka mynd skaltu veita myndavélinni aðgang"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Til að deila mynd skaltu veita margmiðlunarefni aðgang"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Taka mynd"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velja mynd"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Senda skilaboð"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Mynd send með Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Skilaboð send með Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sendir mynd…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Áríðandi! Svaraðu endilega!</string>
+  <string name="want_to_chat">Viltu spjalla?</string>
+  <string name="quick_question">Snögg spurning...</string>
+  <string name="message_composer_custom_message_hint">Skrifa sérsniðin skilaboð</string>
+  <string name="send_and_call">Senda og hringja</string>
+  <string name="share_and_call">Deila og hringja</string>
+  <string name="gallery_item_description">mynd %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">mynd</string>
+  <string name="camera_media_failure">Ekki var hægt að hlaða mynd frá myndavél</string>
+  <string name="allow">Leyfa</string>
+  <string name="camera_permission_text">Til að taka mynd skaltu veita myndavélinni aðgang</string>
+  <string name="gallery_permission_text">Til að deila mynd skaltu veita margmiðlunarefni aðgang</string>
+  <string name="description_call_composer_camera">Taka mynd</string>
+  <string name="description_call_composer_photo">Velja mynd</string>
+  <string name="description_call_composer_message">Senda skilaboð</string>
+  <string name="image_sent_messages">Mynd send með Messages</string>
+  <string name="message_sent_messages">Skilaboð send með Messages</string>
+  <string name="call_composer_image_uploading">Sendir mynd…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
index f06b0d85d..5607038b5 100644
--- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"È urgente, per favore rispondi!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vuoi chattare?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Domanda rapida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Scrivi un messaggio personalizzato"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Invia e chiama"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Condividi e chiama"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"immagine: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"immagine"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Impossibile caricare l\'immagine della fotocamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Consenti"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Per poter scattare una foto devi concedere l\'accesso alla fotocamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Scatta una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Scegli una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Invia un messaggio"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto inviata tramite Messaggi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messaggio inviato tramite Messaggi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Invio dell\'immagine…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">È urgente, per favore rispondi!</string>
+  <string name="want_to_chat">Vuoi chattare?</string>
+  <string name="quick_question">Domanda rapida…</string>
+  <string name="message_composer_custom_message_hint">Scrivi un messaggio personalizzato</string>
+  <string name="send_and_call">Invia e chiama</string>
+  <string name="share_and_call">Condividi e chiama</string>
+  <string name="gallery_item_description">immagine: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">immagine</string>
+  <string name="camera_media_failure">Impossibile caricare l\'immagine della fotocamera</string>
+  <string name="allow">Consenti</string>
+  <string name="camera_permission_text">Per poter scattare una foto devi concedere l\'accesso alla fotocamera</string>
+  <string name="gallery_permission_text">Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali</string>
+  <string name="description_call_composer_camera">Scatta una foto</string>
+  <string name="description_call_composer_photo">Scegli una foto</string>
+  <string name="description_call_composer_message">Invia un messaggio</string>
+  <string name="image_sent_messages">Foto inviata tramite Messaggi</string>
+  <string name="message_sent_messages">Messaggio inviato tramite Messaggi</string>
+  <string name="call_composer_image_uploading">Invio dell\'immagine…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
index 8ed808b26..fa1f87312 100644
--- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"זה דחוף! ענה בבקשה!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"רוצה לשוחח בצ\'אט?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"שאלה קצרה…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"כתוב הודעה מותאמת אישית"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"שלח והתקשר"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"שתף והתקשר"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"תמונה <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"תמונה"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"לא ניתן לטעון את התמונה מהמצלמה"</string>
-    <string name="allow" msgid="8637148297403066623">"אפשר"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"צילום תמונה"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"בחירת תמונה"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"שליחת הודעה"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"‏התמונה נשלחה דרך אפליקציית Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"‏ההודעה נשלחה דרך אפליקציית Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"התמונה נשלחת…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">זה דחוף! ענה בבקשה!</string>
+  <string name="want_to_chat">רוצה לשוחח בצ\'אט?</string>
+  <string name="quick_question">שאלה קצרה…</string>
+  <string name="message_composer_custom_message_hint">כתוב הודעה מותאמת אישית</string>
+  <string name="send_and_call">שלח והתקשר</string>
+  <string name="share_and_call">שתף והתקשר</string>
+  <string name="gallery_item_description">תמונה %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">תמונה</string>
+  <string name="camera_media_failure">לא ניתן לטעון את התמונה מהמצלמה</string>
+  <string name="allow">אפשר</string>
+  <string name="camera_permission_text">כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה</string>
+  <string name="gallery_permission_text">כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה</string>
+  <string name="description_call_composer_camera">צילום תמונה</string>
+  <string name="description_call_composer_photo">בחירת תמונה</string>
+  <string name="description_call_composer_message">שליחת הודעה</string>
+  <string name="image_sent_messages">‏התמונה נשלחה דרך אפליקציית Messages</string>
+  <string name="message_sent_messages">‏ההודעה נשלחה דרך אפליקציית Messages</string>
+  <string name="call_composer_image_uploading">התמונה נשלחת…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
index 61ad0ce82..265ca8494 100644
--- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"至急応答してください。"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"チャットしましょうか？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"聞きたいことがあります…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"カスタム メッセージを入力"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"送信して発信"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"共有して発信"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"画像（<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>）"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"画像"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"カメラ内の画像を読み込めませんでした"</string>
-    <string name="allow" msgid="8637148297403066623">"許可"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"写真を撮るには、まずカメラへのアクセスを許可してください"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"画像を共有するには、まずメディアへのアクセスを許可してください"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"画像を撮影します"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"写真を選択します"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"メッセージを送信します"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Android メッセージで写真が送信されました"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Android メッセージでメッセージが送信されました"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"画像を送信しています…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">至急応答してください。</string>
+  <string name="want_to_chat">チャットしましょうか？</string>
+  <string name="quick_question">聞きたいことがあります…</string>
+  <string name="message_composer_custom_message_hint">カスタム メッセージを入力</string>
+  <string name="send_and_call">送信して発信</string>
+  <string name="share_and_call">共有して発信</string>
+  <string name="gallery_item_description">画像（%1$tB %1$te %1$tY %1$tl %1$tM %1$tp）</string>
+  <string name="gallery_item_description_no_date">画像</string>
+  <string name="camera_media_failure">カメラ内の画像を読み込めませんでした</string>
+  <string name="allow">許可</string>
+  <string name="camera_permission_text">写真を撮るには、まずカメラへのアクセスを許可してください</string>
+  <string name="gallery_permission_text">画像を共有するには、まずメディアへのアクセスを許可してください</string>
+  <string name="description_call_composer_camera">画像を撮影します</string>
+  <string name="description_call_composer_photo">写真を選択します</string>
+  <string name="description_call_composer_message">メッセージを送信します</string>
+  <string name="image_sent_messages">Android メッセージで写真が送信されました</string>
+  <string name="message_sent_messages">Android メッセージでメッセージが送信されました</string>
+  <string name="call_composer_image_uploading">画像を送信しています…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
index 4d65fa327..cacdf0e57 100644
--- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"სასწრაფოა! გთხოვთ, აიღოთ ყურმილი!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"გსურთ ჩეთი?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"სწრაფი შეკითხვა…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"დაწერეთ მორგებ. შეტყობინება"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"გაგზავნა და დარეკვა"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"გაზიარება და დარეკვა"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"სურათი, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"სურათი"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"კამერის სურათი ვერ ჩაიტვირთა"</string>
-    <string name="allow" msgid="8637148297403066623">"ნების დართვა"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ფოტოს გადასაღებად მიეცით კამერაზე წვდომა"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"სურათის გასაზიარებლად მიეცით მედიაზე წვდომა"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"სურათის გადაღება"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ფოტოს არჩევა"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"შეტყობინების გაგზავნა"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ფოტო გაიგზავნა Messages აპიდან"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"შეტყობინება გაიგზავნა Messages აპიდან"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"მიმდინარეობს სურათის გაგზავნა…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">სასწრაფოა! გთხოვთ, აიღოთ ყურმილი!</string>
+  <string name="want_to_chat">გსურთ ჩეთი?</string>
+  <string name="quick_question">სწრაფი შეკითხვა…</string>
+  <string name="message_composer_custom_message_hint">დაწერეთ მორგებ. შეტყობინება</string>
+  <string name="send_and_call">გაგზავნა და დარეკვა</string>
+  <string name="share_and_call">გაზიარება და დარეკვა</string>
+  <string name="gallery_item_description">სურათი, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">სურათი</string>
+  <string name="camera_media_failure">კამერის სურათი ვერ ჩაიტვირთა</string>
+  <string name="allow">ნების დართვა</string>
+  <string name="camera_permission_text">ფოტოს გადასაღებად მიეცით კამერაზე წვდომა</string>
+  <string name="gallery_permission_text">სურათის გასაზიარებლად მიეცით მედიაზე წვდომა</string>
+  <string name="description_call_composer_camera">სურათის გადაღება</string>
+  <string name="description_call_composer_photo">ფოტოს არჩევა</string>
+  <string name="description_call_composer_message">შეტყობინების გაგზავნა</string>
+  <string name="image_sent_messages">ფოტო გაიგზავნა Messages აპიდან</string>
+  <string name="message_sent_messages">შეტყობინება გაიგზავნა Messages აპიდან</string>
+  <string name="call_composer_image_uploading">მიმდინარეობს სურათის გაგზავნა…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
index 80f9caa5b..40de609aa 100644
--- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Шұғыл! Телефонды алыңыз!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Чаттасқыңыз келе ме?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Жылдам сұрақ..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Арнаулы хабар жазу"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Жіберу және қоңырау шалу"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Бөлісу және қоңырау шалу"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"сурет, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"сурет"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Камера суреті жүктелмеді"</string>
-    <string name="allow" msgid="8637148297403066623">"Рұқсат беру"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Суретке түсіру үшін камераға кіруге рұқсат беріңіз"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Суретке түсіру"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Суретті таңдау"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Хабар жіберу"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Сурет Messages арқылы жіберілді"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Хабар Messages арқылы жіберілді"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Сурет жіберілуде..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Шұғыл! Телефонды алыңыз!</string>
+  <string name="want_to_chat">Чаттасқыңыз келе ме?</string>
+  <string name="quick_question">Жылдам сұрақ...</string>
+  <string name="message_composer_custom_message_hint">Арнаулы хабар жазу</string>
+  <string name="send_and_call">Жіберу және қоңырау шалу</string>
+  <string name="share_and_call">Бөлісу және қоңырау шалу</string>
+  <string name="gallery_item_description">сурет, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">сурет</string>
+  <string name="camera_media_failure">Камера суреті жүктелмеді</string>
+  <string name="allow">Рұқсат беру</string>
+  <string name="camera_permission_text">Суретке түсіру үшін камераға кіруге рұқсат беріңіз</string>
+  <string name="gallery_permission_text">Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз</string>
+  <string name="description_call_composer_camera">Суретке түсіру</string>
+  <string name="description_call_composer_photo">Суретті таңдау</string>
+  <string name="description_call_composer_message">Хабар жіберу</string>
+  <string name="image_sent_messages">Сурет Messages арқылы жіберілді</string>
+  <string name="message_sent_messages">Хабар Messages арқылы жіберілді</string>
+  <string name="call_composer_image_uploading">Сурет жіберілуде...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
index b16534c47..68383e7da 100644
--- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"បន្ទាន់! សូម​ជ្រើសយក!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"តើ​ចង់​ជជែក?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"សំណួរ​រហ័ស…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"សរសេរ​សារ​ផ្ទាល់ខ្លួន"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ផ្ញើ និង​ហៅ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ចែករំលែក និង​ហៅ​ទូរសព្ទ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"រូបភាព <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"រូបភាព"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"មិន​អាច​ផ្ទុក​រូបភាព​​​ពី​កាមេរ៉ា​បាន​ទេ"</string>
-    <string name="allow" msgid="8637148297403066623">"អនុញ្ញាត"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ថតរូប"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ជ្រើសរើស​រូបថត"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ផ្ញើសារ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"កំពុង​ផ្ញើ​រូបភាព..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">បន្ទាន់! សូម​ជ្រើសយក!</string>
+  <string name="want_to_chat">តើ​ចង់​ជជែក?</string>
+  <string name="quick_question">សំណួរ​រហ័ស…</string>
+  <string name="message_composer_custom_message_hint">សរសេរ​សារ​ផ្ទាល់ខ្លួន</string>
+  <string name="send_and_call">ផ្ញើ និង​ហៅ</string>
+  <string name="share_and_call">ចែករំលែក និង​ហៅ​ទូរសព្ទ</string>
+  <string name="gallery_item_description">រូបភាព %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">រូបភាព</string>
+  <string name="camera_media_failure">មិន​អាច​ផ្ទុក​រូបភាព​​​ពី​កាមេរ៉ា​បាន​ទេ</string>
+  <string name="allow">អនុញ្ញាត</string>
+  <string name="camera_permission_text">ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា</string>
+  <string name="gallery_permission_text">ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ</string>
+  <string name="description_call_composer_camera">ថតរូប</string>
+  <string name="description_call_composer_photo">ជ្រើសរើស​រូបថត</string>
+  <string name="description_call_composer_message">ផ្ញើសារ</string>
+  <string name="image_sent_messages">រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages</string>
+  <string name="message_sent_messages">សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages</string>
+  <string name="call_composer_image_uploading">កំពុង​ផ្ញើ​រូបភាព...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
index 59de5e7b6..ca69d3ce1 100644
--- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"ತುರ್ತು! ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ಚಾಟ್ ಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ತ್ವರಿತ ಪ್ರಶ್ನೆ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ಕಳುಹಿಸಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ಚಿತ್ರ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ಚಿತ್ರ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ಕ್ಯಾಮರಾ ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
-    <string name="allow" msgid="8637148297403066623">"ಅನುಮತಿಸಿ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ಚಿತ್ರ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ತುರ್ತು! ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ!</string>
+  <string name="want_to_chat">ಚಾಟ್ ಮಾಡಲು ಬಯಸುವಿರಾ?</string>
+  <string name="quick_question">ತ್ವರಿತ ಪ್ರಶ್ನೆ…</string>
+  <string name="message_composer_custom_message_hint">ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ</string>
+  <string name="send_and_call">ಕಳುಹಿಸಿ ಮತ್ತು ಕರೆ ಮಾಡಿ</string>
+  <string name="share_and_call">ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ</string>
+  <string name="gallery_item_description">ಚಿತ್ರ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ಚಿತ್ರ</string>
+  <string name="camera_media_failure">ಕ್ಯಾಮರಾ ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ</string>
+  <string name="allow">ಅನುಮತಿಸಿ</string>
+  <string name="camera_permission_text">ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ</string>
+  <string name="gallery_permission_text">ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ</string>
+  <string name="description_call_composer_camera">ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ</string>
+  <string name="description_call_composer_photo">ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="description_call_composer_message">ಸಂದೇಶ ಕಳುಹಿಸಿ</string>
+  <string name="image_sent_messages">ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ</string>
+  <string name="message_sent_messages">ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ</string>
+  <string name="call_composer_image_uploading">ಚಿತ್ರ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
index 7df4a703a..5261805dd 100644
--- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"긴급! 선택해 주세요."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"채팅에 참여하고 싶으신가요?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"빠른 질문…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"맞춤 메시지를 작성하세요."</string>
-    <string name="send_and_call" msgid="3749091015058610762">"보내기 및 전화 걸기"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"공유 및 전화 걸기"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"이미지 <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"이미지"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"카메라 이미지를 로드할 수 없습니다."</string>
-    <string name="allow" msgid="8637148297403066623">"허용"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"사진 촬영"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"사진 선택"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"메시지 보내기"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"메시지를 통해 전송된 사진"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"메시지를 통해 전송된 메시지"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"이미지 전송 중…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">긴급! 선택해 주세요.</string>
+  <string name="want_to_chat">채팅에 참여하고 싶으신가요?</string>
+  <string name="quick_question">빠른 질문…</string>
+  <string name="message_composer_custom_message_hint">맞춤 메시지를 작성하세요.</string>
+  <string name="send_and_call">보내기 및 전화 걸기</string>
+  <string name="share_and_call">공유 및 전화 걸기</string>
+  <string name="gallery_item_description">이미지 %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">이미지</string>
+  <string name="camera_media_failure">카메라 이미지를 로드할 수 없습니다.</string>
+  <string name="allow">허용</string>
+  <string name="camera_permission_text">사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요.</string>
+  <string name="gallery_permission_text">이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요.</string>
+  <string name="description_call_composer_camera">사진 촬영</string>
+  <string name="description_call_composer_photo">사진 선택</string>
+  <string name="description_call_composer_message">메시지 보내기</string>
+  <string name="image_sent_messages">메시지를 통해 전송된 사진</string>
+  <string name="message_sent_messages">메시지를 통해 전송된 메시지</string>
+  <string name="call_composer_image_uploading">이미지 전송 중…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
index 1a8a395a4..b11a05823 100644
--- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Шашылыш! Телефонду алыңыз!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Маектешесизби?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Тез суроо…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Башка билдирүүнү жазыңыз"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Жөнөтүп, анан чалуу"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Бөлүшүү жана чалуу"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"сүрөт, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"сүрөт"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Камерадан сүрөт жүктөлгөн жок"</string>
-    <string name="allow" msgid="8637148297403066623">"Уруксат берүү"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Сүрөткө тартуу"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Сүрөттү тандоо"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Билдирүү жөнөтүү"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Сүрөт жөнөтүлүүдө..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Шашылыш! Телефонду алыңыз!</string>
+  <string name="want_to_chat">Маектешесизби?</string>
+  <string name="quick_question">Тез суроо…</string>
+  <string name="message_composer_custom_message_hint">Башка билдирүүнү жазыңыз</string>
+  <string name="send_and_call">Жөнөтүп, анан чалуу</string>
+  <string name="share_and_call">Бөлүшүү жана чалуу</string>
+  <string name="gallery_item_description">сүрөт, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">сүрөт</string>
+  <string name="camera_media_failure">Камерадан сүрөт жүктөлгөн жок</string>
+  <string name="allow">Уруксат берүү</string>
+  <string name="camera_permission_text">Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз</string>
+  <string name="gallery_permission_text">Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз</string>
+  <string name="description_call_composer_camera">Сүрөткө тартуу</string>
+  <string name="description_call_composer_photo">Сүрөттү тандоо</string>
+  <string name="description_call_composer_message">Билдирүү жөнөтүү</string>
+  <string name="image_sent_messages">Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү</string>
+  <string name="message_sent_messages">Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү</string>
+  <string name="call_composer_image_uploading">Сүрөт жөнөтүлүүдө...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
index 42ae0f1cb..b4f0473ad 100644
--- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"ດ່ວນ! ຮັບສາຍແດ່!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ຢາກລົມບໍ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ມີເລື່ອງຖາມໜ້ອຍໜຶ່ງ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ສົ່ງ ແລະ ໂທ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ແບ່ງປັນ ແລະ ໂທ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ຮູບ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ຮູບ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ບໍ່ສາມາດໂຫລດຮູບຈາກກ້ອງໄດ້"</string>
-    <string name="allow" msgid="8637148297403066623">"ອະນຸຍາດ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ຖ່າຍຮູບ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ເລືອກຮູບພາບ..."</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ກຳລັງສົ່ງຮູບພາບ..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ດ່ວນ! ຮັບສາຍແດ່!</string>
+  <string name="want_to_chat">ຢາກລົມບໍ?</string>
+  <string name="quick_question">ມີເລື່ອງຖາມໜ້ອຍໜຶ່ງ…</string>
+  <string name="message_composer_custom_message_hint">ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ</string>
+  <string name="send_and_call">ສົ່ງ ແລະ ໂທ</string>
+  <string name="share_and_call">ແບ່ງປັນ ແລະ ໂທ</string>
+  <string name="gallery_item_description">ຮູບ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ຮູບ</string>
+  <string name="camera_media_failure">ບໍ່ສາມາດໂຫລດຮູບຈາກກ້ອງໄດ້</string>
+  <string name="allow">ອະນຸຍາດ</string>
+  <string name="camera_permission_text">ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ</string>
+  <string name="gallery_permission_text">ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ</string>
+  <string name="description_call_composer_camera">ຖ່າຍຮູບ</string>
+  <string name="description_call_composer_photo">ເລືອກຮູບພາບ...</string>
+  <string name="description_call_composer_message">ສົ່ງຂໍ້ຄວາມ</string>
+  <string name="image_sent_messages">ສົ່ງຮູບຜ່ານ Messages ແລ້ວ</string>
+  <string name="message_sent_messages">ສົ່ງຮູບຜ່ານ Messages ແລ້ວ</string>
+  <string name="call_composer_image_uploading">ກຳລັງສົ່ງຮູບພາບ...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
index 59112d3cf..20506fa96 100644
--- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Skubu! Atsiliepkite!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Norite kalbėtis?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Trumpas klausimas…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Parašykite tinkintą praneš."</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Siųsti ir skambinti"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Bendrinti ir skambinti"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"vaizdas (<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>)"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"vaizdas"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nepavyko įkelti fotoaparato vaizdo"</string>
-    <string name="allow" msgid="8637148297403066623">"Leisti"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografuoti"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pasirinkti nuotrauką"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Siųsti pranešimą"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Nuotrauka išsiųsta naudojant „Messages“"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Pranešimas išsiųstas naudojant „Messages“"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Siunčiamas vaizdas..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Skubu! Atsiliepkite!</string>
+  <string name="want_to_chat">Norite kalbėtis?</string>
+  <string name="quick_question">Trumpas klausimas…</string>
+  <string name="message_composer_custom_message_hint">Parašykite tinkintą praneš.</string>
+  <string name="send_and_call">Siųsti ir skambinti</string>
+  <string name="share_and_call">Bendrinti ir skambinti</string>
+  <string name="gallery_item_description">vaizdas (%1$tB %1$te %1$tY %1$tl %1$tM %1$tp)</string>
+  <string name="gallery_item_description_no_date">vaizdas</string>
+  <string name="camera_media_failure">Nepavyko įkelti fotoaparato vaizdo</string>
+  <string name="allow">Leisti</string>
+  <string name="camera_permission_text">Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą</string>
+  <string name="gallery_permission_text">Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją</string>
+  <string name="description_call_composer_camera">Fotografuoti</string>
+  <string name="description_call_composer_photo">Pasirinkti nuotrauką</string>
+  <string name="description_call_composer_message">Siųsti pranešimą</string>
+  <string name="image_sent_messages">Nuotrauka išsiųsta naudojant „Messages“</string>
+  <string name="message_sent_messages">Pranešimas išsiųstas naudojant „Messages“</string>
+  <string name="call_composer_image_uploading">Siunčiamas vaizdas...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
index 8aa954096..af5fb2e5b 100644
--- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Tas ir svarīgi. Lūdzu, atbildiet!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vai vēlaties tērzēt?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Ātrs jautājums…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Rakstīt pielāgotu ziņojumu"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Sūtīt un zvanīt"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Kopīgot un zvanīt"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"attēls, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"attēls"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nevarēja ielādēt kameras attēlu."</string>
-    <string name="allow" msgid="8637148297403066623">"Atļaut"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Uzņemt attēlu"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izvēlēties fotoattēlu"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sūtīt ziņojumu"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Ziņojums nosūtīts, izmantojot lietotni Ziņojumi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Tiek sūtīts attēls…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Tas ir svarīgi. Lūdzu, atbildiet!</string>
+  <string name="want_to_chat">Vai vēlaties tērzēt?</string>
+  <string name="quick_question">Ātrs jautājums…</string>
+  <string name="message_composer_custom_message_hint">Rakstīt pielāgotu ziņojumu</string>
+  <string name="send_and_call">Sūtīt un zvanīt</string>
+  <string name="share_and_call">Kopīgot un zvanīt</string>
+  <string name="gallery_item_description">attēls, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">attēls</string>
+  <string name="camera_media_failure">Nevarēja ielādēt kameras attēlu.</string>
+  <string name="allow">Atļaut</string>
+  <string name="camera_permission_text">Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai.</string>
+  <string name="gallery_permission_text">Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam.</string>
+  <string name="description_call_composer_camera">Uzņemt attēlu</string>
+  <string name="description_call_composer_photo">Izvēlēties fotoattēlu</string>
+  <string name="description_call_composer_message">Sūtīt ziņojumu</string>
+  <string name="image_sent_messages">Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi</string>
+  <string name="message_sent_messages">Ziņojums nosūtīts, izmantojot lietotni Ziņojumi</string>
+  <string name="call_composer_image_uploading">Tiek sūtīts attēls…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
index 126b44c53..4aed43a66 100644
--- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Итно! Јавете се!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Сакате да разговарате?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Кратко прашање…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напиши приспособена порака"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Испратете и повикајте"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Сподели и повикај"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"слика од <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"слика"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не можеше да се вчита слика од камерата"</string>
-    <string name="allow" msgid="8637148297403066623">"Дозволете"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"За да фотографирате, дозволете пристап до „Камера“"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите слика, дозволете пристап до Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Фотографирајте"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изберете фотографија"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Испратете порака"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фотографијата е испратена преку Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Пораката е испратена преку Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Се испраќа слика…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Итно! Јавете се!</string>
+  <string name="want_to_chat">Сакате да разговарате?</string>
+  <string name="quick_question">Кратко прашање…</string>
+  <string name="message_composer_custom_message_hint">Напиши приспособена порака</string>
+  <string name="send_and_call">Испратете и повикајте</string>
+  <string name="share_and_call">Сподели и повикај</string>
+  <string name="gallery_item_description">слика од %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">слика</string>
+  <string name="camera_media_failure">Не можеше да се вчита слика од камерата</string>
+  <string name="allow">Дозволете</string>
+  <string name="camera_permission_text">За да фотографирате, дозволете пристап до „Камера“</string>
+  <string name="gallery_permission_text">За да споделите слика, дозволете пристап до Media</string>
+  <string name="description_call_composer_camera">Фотографирајте</string>
+  <string name="description_call_composer_photo">Изберете фотографија</string>
+  <string name="description_call_composer_message">Испратете порака</string>
+  <string name="image_sent_messages">Фотографијата е испратена преку Messages</string>
+  <string name="message_sent_messages">Пораката е испратена преку Messages</string>
+  <string name="call_composer_image_uploading">Се испраќа слика…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
index 67175cc1e..332442a29 100644
--- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"അടിയന്തരാവശ്യം! കോളെടുക്കൂ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ചാറ്റ് ചെയ്യണോ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"അടിയന്തര ചോദ്യം…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"അയച്ചശേഷം കോൾ ചെയ്യുക"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"പങ്കിടുക, കോൾ ചെയ്യുക"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ചിത്രം <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ചിത്രം"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ക്യാമറ ചിത്രം ലോഡുചെയ്യാനായില്ല"</string>
-    <string name="allow" msgid="8637148297403066623">"അനുവദിക്കുക"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ഒരു ചിത്രമെടുക്കുക"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"മെസേജ് വഴി ഫോട്ടോ അയച്ചു"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"മെസേജ് വഴി സന്ദേശം അയച്ചു"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ചിത്രം അയയ്‌ക്കുന്നു..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">അടിയന്തരാവശ്യം! കോളെടുക്കൂ!</string>
+  <string name="want_to_chat">ചാറ്റ് ചെയ്യണോ?</string>
+  <string name="quick_question">അടിയന്തര ചോദ്യം…</string>
+  <string name="message_composer_custom_message_hint">ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ</string>
+  <string name="send_and_call">അയച്ചശേഷം കോൾ ചെയ്യുക</string>
+  <string name="share_and_call">പങ്കിടുക, കോൾ ചെയ്യുക</string>
+  <string name="gallery_item_description">ചിത്രം %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ചിത്രം</string>
+  <string name="camera_media_failure">ക്യാമറ ചിത്രം ലോഡുചെയ്യാനായില്ല</string>
+  <string name="allow">അനുവദിക്കുക</string>
+  <string name="camera_permission_text">ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക</string>
+  <string name="gallery_permission_text">ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക</string>
+  <string name="description_call_composer_camera">ഒരു ചിത്രമെടുക്കുക</string>
+  <string name="description_call_composer_photo">ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക</string>
+  <string name="description_call_composer_message">ഒരു സന്ദേശം അയയ്‌ക്കുക</string>
+  <string name="image_sent_messages">മെസേജ് വഴി ഫോട്ടോ അയച്ചു</string>
+  <string name="message_sent_messages">മെസേജ് വഴി സന്ദേശം അയച്ചു</string>
+  <string name="call_composer_image_uploading">ചിത്രം അയയ്‌ക്കുന്നു...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
index 1de1f1152..1387a7ccd 100644
--- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Яаралтай! Утсаа авна уу!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Чатлахыг хүсэж байна уу?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Шуурхай асуулт…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Тусгай зурвас бичих"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Илгээгээд залгах"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Хуваалцаад залгах"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"зураг <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"зураг"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Камерын дүрсийг ачаалж чадсангүй"</string>
-    <string name="allow" msgid="8637148297403066623">"Зөвшөөрөх"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Зураг авах"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Зураг сонгоно уу"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Зурвас илгээх"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Зургийг Зурвасаар дамжуулан илгээсэн"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Зурвасыг Зурвасаар дамжуулан илгээсэн"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Зураг илгээж байна..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Яаралтай! Утсаа авна уу!</string>
+  <string name="want_to_chat">Чатлахыг хүсэж байна уу?</string>
+  <string name="quick_question">Шуурхай асуулт…</string>
+  <string name="message_composer_custom_message_hint">Тусгай зурвас бичих</string>
+  <string name="send_and_call">Илгээгээд залгах</string>
+  <string name="share_and_call">Хуваалцаад залгах</string>
+  <string name="gallery_item_description">зураг %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">зураг</string>
+  <string name="camera_media_failure">Камерын дүрсийг ачаалж чадсангүй</string>
+  <string name="allow">Зөвшөөрөх</string>
+  <string name="camera_permission_text">Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай</string>
+  <string name="gallery_permission_text">Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай</string>
+  <string name="description_call_composer_camera">Зураг авах</string>
+  <string name="description_call_composer_photo">Зураг сонгоно уу</string>
+  <string name="description_call_composer_message">Зурвас илгээх</string>
+  <string name="image_sent_messages">Зургийг Зурвасаар дамжуулан илгээсэн</string>
+  <string name="message_sent_messages">Зурвасыг Зурвасаар дамжуулан илгээсэн</string>
+  <string name="call_composer_image_uploading">Зураг илгээж байна...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
index 40a794d52..d62462439 100644
--- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"तातडीचे! कृपया घ्या!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"चॅट करू इच्छिता?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"द्रुत प्रश्न…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"एक सानुकूल संदेश लिहा"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"पाठवा आणि कॉल करा"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"सामायिक करा आणि कॉल करा"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"प्रतिमा <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"प्रतिमा"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"कॅमेरा प्रतिमा लोड करणे शक्य झाले नाही"</string>
-    <string name="allow" msgid="8637148297403066623">"अनुमती द्या"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"एखादी प्रतिमा सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"एक फोटो घ्या"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"फोटो निवडा"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"एक संदेश पाठवा"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages द्वारे फोटो पाठविला"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages द्वारे संदेश पाठविला"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"इमेज पाठवत आहे…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">तातडीचे! कृपया घ्या!</string>
+  <string name="want_to_chat">चॅट करू इच्छिता?</string>
+  <string name="quick_question">द्रुत प्रश्न…</string>
+  <string name="message_composer_custom_message_hint">एक सानुकूल मेसेज लिहा</string>
+  <string name="send_and_call">पाठवा आणि कॉल करा</string>
+  <string name="share_and_call">शेअर करा आणि कॉल करा</string>
+  <string name="gallery_item_description">इमेज %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">इमेज</string>
+  <string name="camera_media_failure">कॅमेरा इमेज लोड करणे शक्य झाले नाही</string>
+  <string name="allow">अनुमती द्या</string>
+  <string name="camera_permission_text">एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या</string>
+  <string name="gallery_permission_text">एखादी इमेज सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या</string>
+  <string name="description_call_composer_camera">एक फोटो घ्या</string>
+  <string name="description_call_composer_photo">फोटो निवडा</string>
+  <string name="description_call_composer_message">एक मेसेज पाठवा</string>
+  <string name="image_sent_messages">Messages द्वारे फोटो पाठविला</string>
+  <string name="message_sent_messages">Messages द्वारे मेसेज पाठविला</string>
+  <string name="call_composer_image_uploading">इमेज पाठवत आहे…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
index 1f37e154a..56445e653 100644
--- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Penting! Sila jawab!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ingin bersembang?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Soalan pantas…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Tulis mesej tersuai"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Hantar dan panggil"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Kongsi dan hubungi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imej <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imej"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Tidak dapat memuatkan imej kamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Benarkan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses kepada Kamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk berkongsi imej, berikan akses kepada Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ambil gambar"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Hantar mesej"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo dihantar melalui Mesej"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesej dihantar melalui Mesej"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Menghantar imej…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Penting! Sila jawab!</string>
+  <string name="want_to_chat">Ingin bersembang?</string>
+  <string name="quick_question">Soalan pantas…</string>
+  <string name="message_composer_custom_message_hint">Tulis mesej tersuai</string>
+  <string name="send_and_call">Hantar dan panggil</string>
+  <string name="share_and_call">Kongsi dan hubungi</string>
+  <string name="gallery_item_description">imej %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imej</string>
+  <string name="camera_media_failure">Tidak dapat memuatkan imej kamera</string>
+  <string name="allow">Benarkan</string>
+  <string name="camera_permission_text">Untuk mengambil foto, berikan akses kepada Kamera</string>
+  <string name="gallery_permission_text">Untuk berkongsi imej, berikan akses kepada Media</string>
+  <string name="description_call_composer_camera">Ambil gambar</string>
+  <string name="description_call_composer_photo">Pilih foto</string>
+  <string name="description_call_composer_message">Hantar mesej</string>
+  <string name="image_sent_messages">Photo dihantar melalui Mesej</string>
+  <string name="message_sent_messages">Mesej dihantar melalui Mesej</string>
+  <string name="call_composer_image_uploading">Menghantar imej…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
index 5f8de84b8..b86d02978 100644
--- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"အရေးကြီးသည်။ ဖုန်းကိုင်ပါ။"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ချတ်လုပ်လိုပါသလား။"</string>
-    <string name="quick_question" msgid="3501160802390214092">"အမြန်မေးခွန်း…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ပို့ပြီး ဖုန်းခေါ်ရန်"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"မျှဝေပြီး ခေါ်ဆိုရန်"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ပုံ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ပုံ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ကင်မရာမှပုံကို မရယူနိုင်ပါ"</string>
-    <string name="allow" msgid="8637148297403066623">"ခွင့်ပြုရန်"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ဓာတ်ပုံတစ်ပုံ ရွေးရန်"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ပုံပို့နေသည်…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">အရေးကြီးသည်။ ဖုန်းကိုင်ပါ။</string>
+  <string name="want_to_chat">ချတ်လုပ်လိုပါသလား။</string>
+  <string name="quick_question">အမြန်မေးခွန်း…</string>
+  <string name="message_composer_custom_message_hint">စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ</string>
+  <string name="send_and_call">ပို့ပြီး ဖုန်းခေါ်ရန်</string>
+  <string name="share_and_call">မျှဝေပြီး ခေါ်ဆိုရန်</string>
+  <string name="gallery_item_description">ပုံ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ပုံ</string>
+  <string name="camera_media_failure">ကင်မရာမှပုံကို မရယူနိုင်ပါ</string>
+  <string name="allow">ခွင့်ပြုရန်</string>
+  <string name="camera_permission_text">ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ</string>
+  <string name="gallery_permission_text">ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ</string>
+  <string name="description_call_composer_camera">ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်</string>
+  <string name="description_call_composer_photo">ဓာတ်ပုံတစ်ပုံ ရွေးရန်</string>
+  <string name="description_call_composer_message">မက်ဆေ့ဂျ်ပို့ရန်</string>
+  <string name="image_sent_messages">မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ</string>
+  <string name="message_sent_messages">မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ</string>
+  <string name="call_composer_image_uploading">ပုံပို့နေသည်…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
index c9e1296e9..134969b1e 100644
--- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Haster! Vennligst svar."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vil du chatte?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Et kjapt spørsmål …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv egendefinert melding"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Sende og ringe"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"bilde <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bilde"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kunne ikke laste inn kamerabilde"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillat"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sender bildet …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Haster! Vennligst svar.</string>
+  <string name="want_to_chat">Vil du chatte?</string>
+  <string name="quick_question">Et kjapt spørsmål …</string>
+  <string name="message_composer_custom_message_hint">Skriv egendefinert melding</string>
+  <string name="send_and_call">Sende og ringe</string>
+  <string name="share_and_call">Del og ring</string>
+  <string name="gallery_item_description">bilde %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">bilde</string>
+  <string name="camera_media_failure">Kunne ikke laste inn kamerabilde</string>
+  <string name="allow">Tillat</string>
+  <string name="camera_permission_text">Gi tilgang til kameraet for å ta bilder</string>
+  <string name="gallery_permission_text">Gi Media tilgang for å dele bilder</string>
+  <string name="description_call_composer_camera">Ta et bilde</string>
+  <string name="description_call_composer_photo">Velg et bilde</string>
+  <string name="description_call_composer_message">Send en melding</string>
+  <string name="image_sent_messages">Bildet er sendt via Messages</string>
+  <string name="message_sent_messages">Meldingen er sendt via Messages</string>
+  <string name="call_composer_image_uploading">Sender bildet …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
index 71d40a645..f89e8c2f0 100644
--- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"अत्यन्त जरुरी! कृपया उठाउनुहोस्!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"कुराकानी गर्न चाहनुहुन्छ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"द्रुत प्रश्नहरू…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"आफू अनुकूल सन्देश लेख्‍ने"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"कल पठाउनुहोस्"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"आदान-प्रदान र कल गर्नुहोस्"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"छवि <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"छवि"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"क्यामेराको छवि लोड गर्न सकिएन"</string>
-    <string name="allow" msgid="8637148297403066623">"अनुमति दिनुहोस्"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"छवि आदान-प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"तस्बिर खिच्नुहोस्"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"तस्बिर छनौट गर्नुहोस्"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"सन्देश पठाउनुहोस्"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages मार्फत पठाइएको तस्बिर"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages मार्फत पठाइएको सन्देश"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"छवि पठाइँदै…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">अत्यन्त जरुरी! कृपया उठाउनुहोस्!</string>
+  <string name="want_to_chat">कुराकानी गर्न चाहनुहुन्छ?</string>
+  <string name="quick_question">द्रुत प्रश्नहरू…</string>
+  <string name="message_composer_custom_message_hint">आफू अनुकूल सन्देश लेख्‍ने</string>
+  <string name="send_and_call">कल पठाउनुहोस्</string>
+  <string name="share_and_call">आदान प्रदान र कल गर्नुहोस्</string>
+  <string name="gallery_item_description">छवि %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">छवि</string>
+  <string name="camera_media_failure">क्यामेराको छवि लोड गर्न सकिएन</string>
+  <string name="allow">अनुमति दिनुहोस्</string>
+  <string name="camera_permission_text">तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्</string>
+  <string name="gallery_permission_text">छवि आदान प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्</string>
+  <string name="description_call_composer_camera">तस्बिर खिच्नुहोस्</string>
+  <string name="description_call_composer_photo">तस्बिर छनौट गर्नुहोस्</string>
+  <string name="description_call_composer_message">सन्देश पठाउनुहोस्</string>
+  <string name="image_sent_messages">Messages मार्फत पठाइएको तस्बिर</string>
+  <string name="message_sent_messages">Messages मार्फत पठाइएको सन्देश</string>
+  <string name="call_composer_image_uploading">छवि पठाइँदै…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
index 59c09a39a..e4b344432 100644
--- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Dit is dringend! Neem alsjeblieft op."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Wil je chatten?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Snelle vraag…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Schrijf zelf een bericht"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Verzenden en bellen"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Delen en bellen"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"afbeelding van <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"afbeelding"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kan camera-afbeelding niet laden"</string>
-    <string name="allow" msgid="8637148297403066623">"Toestaan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot Camera om een foto te maken"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot Media om een afbeelding te delen"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Een foto nemen"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Een foto kiezen"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Een bericht verzenden"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto verzonden via Berichten"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Bericht verzonden via Berichten"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Afbeelding verzenden…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Dit is dringend! Neem alsjeblieft op.</string>
+  <string name="want_to_chat">Wil je chatten?</string>
+  <string name="quick_question">Snelle vraag…</string>
+  <string name="message_composer_custom_message_hint">Schrijf zelf een bericht</string>
+  <string name="send_and_call">Verzenden en bellen</string>
+  <string name="share_and_call">Delen en bellen</string>
+  <string name="gallery_item_description">afbeelding van %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">afbeelding</string>
+  <string name="camera_media_failure">Kan camera-afbeelding niet laden</string>
+  <string name="allow">Toestaan</string>
+  <string name="camera_permission_text">Verleen toegang tot Camera om een foto te maken</string>
+  <string name="gallery_permission_text">Verleen toegang tot Media om een afbeelding te delen</string>
+  <string name="description_call_composer_camera">Een foto nemen</string>
+  <string name="description_call_composer_photo">Een foto kiezen</string>
+  <string name="description_call_composer_message">Een bericht verzenden</string>
+  <string name="image_sent_messages">Foto verzonden via Berichten</string>
+  <string name="message_sent_messages">Bericht verzonden via Berichten</string>
+  <string name="call_composer_image_uploading">Afbeelding verzenden…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
index c9e1296e9..134969b1e 100644
--- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Haster! Vennligst svar."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vil du chatte?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Et kjapt spørsmål …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv egendefinert melding"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Sende og ringe"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"bilde <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bilde"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kunne ikke laste inn kamerabilde"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillat"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sender bildet …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Haster! Vennligst svar.</string>
+  <string name="want_to_chat">Vil du chatte?</string>
+  <string name="quick_question">Et kjapt spørsmål …</string>
+  <string name="message_composer_custom_message_hint">Skriv egendefinert melding</string>
+  <string name="send_and_call">Sende og ringe</string>
+  <string name="share_and_call">Del og ring</string>
+  <string name="gallery_item_description">bilde %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">bilde</string>
+  <string name="camera_media_failure">Kunne ikke laste inn kamerabilde</string>
+  <string name="allow">Tillat</string>
+  <string name="camera_permission_text">Gi tilgang til kameraet for å ta bilder</string>
+  <string name="gallery_permission_text">Gi Media tilgang for å dele bilder</string>
+  <string name="description_call_composer_camera">Ta et bilde</string>
+  <string name="description_call_composer_photo">Velg et bilde</string>
+  <string name="description_call_composer_message">Send en melding</string>
+  <string name="image_sent_messages">Bildet er sendt via Messages</string>
+  <string name="message_sent_messages">Meldingen er sendt via Messages</string>
+  <string name="call_composer_image_uploading">Sender bildet …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
index 0a51a63dc..0173ffa64 100644
--- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"ਬਹੁਤ ਜ਼ਰੂਰੀ ਹੈ! ਕਿਰਪਾ ਕਰਕੇ ਚੁੱਕੋ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ਕੀ ਚੈਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ਤਤਕਾਲ ਸਵਾਲ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੁਨੇਹਾ ਲਿਖੋ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ਚਿੱਤਰ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ਚਿੱਤਰ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ਕੈਮਰਾ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
-    <string name="allow" msgid="8637148297403066623">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ਫ਼ੋਟੋ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ਸੁਨੇਹਾ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ਚਿੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ਬਹੁਤ ਜ਼ਰੂਰੀ ਹੈ! ਕਿਰਪਾ ਕਰਕੇ ਚੁੱਕੋ!</string>
+  <string name="want_to_chat">ਕੀ ਚੈਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+  <string name="quick_question">ਤਤਕਾਲ ਸਵਾਲ…</string>
+  <string name="message_composer_custom_message_hint">ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੁਨੇਹਾ ਲਿਖੋ</string>
+  <string name="send_and_call">ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="share_and_call">ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="gallery_item_description">ਚਿੱਤਰ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ਚਿੱਤਰ</string>
+  <string name="camera_media_failure">ਕੈਮਰਾ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</string>
+  <string name="allow">ਇਜਾਜ਼ਤ ਦਿਓ</string>
+  <string name="camera_permission_text">ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ</string>
+  <string name="gallery_permission_text">ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ</string>
+  <string name="description_call_composer_camera">ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ</string>
+  <string name="description_call_composer_photo">ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ</string>
+  <string name="description_call_composer_message">ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="image_sent_messages">ਫ਼ੋਟੋ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ</string>
+  <string name="message_sent_messages">ਸੁਨੇਹਾ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ</string>
+  <string name="call_composer_image_uploading">ਚਿੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
index 130dd8c12..64b213575 100644
--- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"To ważne! Odbierz!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Chcesz porozmawiać na czacie?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Szybkie pytanie…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Wpisz wiadomość"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Wyślij i zadzwoń"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Udostępnij i zadzwoń"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"zdjęcie – <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"zdjęcie"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nie udało się wczytać zdjęcia z aparatu"</string>
-    <string name="allow" msgid="8637148297403066623">"Zezwól"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Aby zrobić zdjęcie, zezwól na dostęp do aparatu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Aby udostępnić zdjęcie, zezwól na dostęp do multimediów"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Zrób zdjęcie"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Wybierz zdjęcie"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Wyślij wiadomość"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Zdjęcie zostało wysłane przez Wiadomości"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Tekst został wysłany przez Wiadomości"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Wysyłam obraz…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">To ważne! Odbierz!</string>
+  <string name="want_to_chat">Chcesz porozmawiać na czacie?</string>
+  <string name="quick_question">Szybkie pytanie…</string>
+  <string name="message_composer_custom_message_hint">Wpisz wiadomość</string>
+  <string name="send_and_call">Wyślij i zadzwoń</string>
+  <string name="share_and_call">Udostępnij i zadzwoń</string>
+  <string name="gallery_item_description">zdjęcie – %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">zdjęcie</string>
+  <string name="camera_media_failure">Nie udało się wczytać zdjęcia z aparatu</string>
+  <string name="allow">Zezwól</string>
+  <string name="camera_permission_text">Aby zrobić zdjęcie, zezwól na dostęp do aparatu</string>
+  <string name="gallery_permission_text">Aby udostępnić zdjęcie, zezwól na dostęp do multimediów</string>
+  <string name="description_call_composer_camera">Zrób zdjęcie</string>
+  <string name="description_call_composer_photo">Wybierz zdjęcie</string>
+  <string name="description_call_composer_message">Wyślij wiadomość</string>
+  <string name="image_sent_messages">Zdjęcie zostało wysłane przez Wiadomości</string>
+  <string name="message_sent_messages">Tekst został wysłany przez Wiadomości</string>
+  <string name="call_composer_image_uploading">Wysyłam obraz…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
index a090d155d..1fea485bc 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"É urgente, atenda!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Quer bater papo?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pergunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escreva sua mensagem"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e ligar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartilhar e ligar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Falha ao carregar a imagem da câmera"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagem..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">É urgente, atenda!</string>
+  <string name="want_to_chat">Quer bater papo?</string>
+  <string name="quick_question">Pergunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escreva sua mensagem</string>
+  <string name="send_and_call">Enviar e ligar</string>
+  <string name="share_and_call">Compartilhar e ligar</string>
+  <string name="gallery_item_description">imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagem</string>
+  <string name="camera_media_failure">Falha ao carregar a imagem da câmera</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tirar uma foto, permita o acesso à câmera</string>
+  <string name="gallery_permission_text">Para compartilhar uma imagem, permita o acesso à mídia</string>
+  <string name="description_call_composer_camera">Tirar uma foto</string>
+  <string name="description_call_composer_photo">Escolher uma foto</string>
+  <string name="description_call_composer_message">Enviar uma mensagem</string>
+  <string name="image_sent_messages">Foto enviada pelo Mensagens</string>
+  <string name="message_sent_messages">Mensagem enviada pelo Mensagens</string>
+  <string name="call_composer_image_uploading">Enviando imagem...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
index 34b3a96a1..44a8c5b0d 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgente! Atenda!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Quer conversar no chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Uma pergunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escreva uma mensagem personalizada"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e ligar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partilhar e ligar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Não foi possível carregar a imagem da câmara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, conceda acesso à Câmara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para partilhar uma imagem, conceda acesso a Multimédia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Selecionar foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada através da aplicação Mensagens"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada através da aplicação Mensagens"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"A enviar imagem…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgente! Atenda!</string>
+  <string name="want_to_chat">Quer conversar no chat?</string>
+  <string name="quick_question">Uma pergunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escreva uma mensagem personalizada</string>
+  <string name="send_and_call">Enviar e ligar</string>
+  <string name="share_and_call">Partilhar e ligar</string>
+  <string name="gallery_item_description">imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagem</string>
+  <string name="camera_media_failure">Não foi possível carregar a imagem da câmara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tirar uma foto, conceda acesso à Câmara</string>
+  <string name="gallery_permission_text">Para partilhar uma imagem, conceda acesso a Multimédia</string>
+  <string name="description_call_composer_camera">Tirar uma foto</string>
+  <string name="description_call_composer_photo">Selecionar foto</string>
+  <string name="description_call_composer_message">Enviar uma mensagem</string>
+  <string name="image_sent_messages">Foto enviada através da aplicação Mensagens</string>
+  <string name="message_sent_messages">Mensagem enviada através da aplicação Mensagens</string>
+  <string name="call_composer_image_uploading">A enviar imagem…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
index a090d155d..1fea485bc 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"É urgente, atenda!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Quer bater papo?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pergunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escreva sua mensagem"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e ligar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartilhar e ligar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Falha ao carregar a imagem da câmera"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagem..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">É urgente, atenda!</string>
+  <string name="want_to_chat">Quer bater papo?</string>
+  <string name="quick_question">Pergunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escreva sua mensagem</string>
+  <string name="send_and_call">Enviar e ligar</string>
+  <string name="share_and_call">Compartilhar e ligar</string>
+  <string name="gallery_item_description">imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagem</string>
+  <string name="camera_media_failure">Falha ao carregar a imagem da câmera</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tirar uma foto, permita o acesso à câmera</string>
+  <string name="gallery_permission_text">Para compartilhar uma imagem, permita o acesso à mídia</string>
+  <string name="description_call_composer_camera">Tirar uma foto</string>
+  <string name="description_call_composer_photo">Escolher uma foto</string>
+  <string name="description_call_composer_message">Enviar uma mensagem</string>
+  <string name="image_sent_messages">Foto enviada pelo Mensagens</string>
+  <string name="message_sent_messages">Mensagem enviada pelo Mensagens</string>
+  <string name="call_composer_image_uploading">Enviando imagem...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
index 29de0ed6a..f1a6598f5 100644
--- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"E urgent! Te rog să răspunzi!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vrei să conversezi prin chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Întrebare rapidă…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Scrieți mesaj personalizat"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Trimiteți și apelați"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Trimiteți și apelați"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagine din <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagine"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nu s-a putut încărca imaginea de la camera foto"</string>
-    <string name="allow" msgid="8637148297403066623">"Permiteți"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Pentru a fotografia, permiteți accesul la Camera foto"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pentru a trimite o imagine, permiteți accesul la Conținutul media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografiați"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Alegeți o fotografie"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Trimiteți un mesaj"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografie trimisă prin Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj trimis prin Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Se trimite imaginea…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">E urgent! Te rog să răspunzi!</string>
+  <string name="want_to_chat">Vrei să conversezi prin chat?</string>
+  <string name="quick_question">Întrebare rapidă…</string>
+  <string name="message_composer_custom_message_hint">Scrieți mesaj personalizat</string>
+  <string name="send_and_call">Trimiteți și apelați</string>
+  <string name="share_and_call">Trimiteți și apelați</string>
+  <string name="gallery_item_description">imagine din %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagine</string>
+  <string name="camera_media_failure">Nu s-a putut încărca imaginea de la camera foto</string>
+  <string name="allow">Permiteți</string>
+  <string name="camera_permission_text">Pentru a fotografia, permiteți accesul la Camera foto</string>
+  <string name="gallery_permission_text">Pentru a trimite o imagine, permiteți accesul la Conținutul media</string>
+  <string name="description_call_composer_camera">Fotografiați</string>
+  <string name="description_call_composer_photo">Alegeți o fotografie</string>
+  <string name="description_call_composer_message">Trimiteți un mesaj</string>
+  <string name="image_sent_messages">Fotografie trimisă prin Messages</string>
+  <string name="message_sent_messages">Mesaj trimis prin Messages</string>
+  <string name="call_composer_image_uploading">Se trimite imaginea…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
index ffdfb29a2..1dffce229 100644
--- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Срочно! Пожалуйста, возьмите трубку!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Хотите пообщаться в чате?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Небольшой вопрос…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Добавьте свой текст"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Отправить и позвонить"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Поделиться и позвонить"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"изображение, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"изображение"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не удалось загрузить изображение с камеры"</string>
-    <string name="allow" msgid="8637148297403066623">"Разрешить"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Чтобы сделать снимок, предоставьте доступ к камере"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Чтобы поделиться изображением, предоставьте доступ к мультимедиа"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Сделать фото"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбрать фото"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Отправить сообщение"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фото отправлено через Android Сообщения"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Сообщение отправлено через Android Сообщения"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Отправка изображения…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Срочно! Пожалуйста, возьмите трубку!</string>
+  <string name="want_to_chat">Хотите пообщаться в чате?</string>
+  <string name="quick_question">Небольшой вопрос…</string>
+  <string name="message_composer_custom_message_hint">Добавьте свой текст</string>
+  <string name="send_and_call">Отправить и позвонить</string>
+  <string name="share_and_call">Поделиться и позвонить</string>
+  <string name="gallery_item_description">изображение, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">изображение</string>
+  <string name="camera_media_failure">Не удалось загрузить изображение с камеры</string>
+  <string name="allow">Разрешить</string>
+  <string name="camera_permission_text">Чтобы сделать снимок, предоставьте доступ к камере</string>
+  <string name="gallery_permission_text">Чтобы поделиться изображением, предоставьте доступ к мультимедиа</string>
+  <string name="description_call_composer_camera">Сделать фото</string>
+  <string name="description_call_composer_photo">Выбрать фото</string>
+  <string name="description_call_composer_message">Отправить сообщение</string>
+  <string name="image_sent_messages">Фото отправлено через Android Сообщения</string>
+  <string name="message_sent_messages">Сообщение отправлено через Android Сообщения</string>
+  <string name="call_composer_image_uploading">Отправка изображения…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
index cdea197a6..2d7ce2477 100644
--- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"හදිසියි! කරුණාකර ගන්න!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"කතාබස් කිරීමට අවශ්‍යද?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ඉක්මන් ප්‍රශ්නය…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"අභිරුචි පණිවිඩයක් ලියන්න"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"යවන්න සහ අමතන්න"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"බෙදා ගෙන අමතන්න"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"රූපය <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"රූපය"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"කැමරා රූපය පූරණය කළ නොහැකි විය"</string>
-    <string name="allow" msgid="8637148297403066623">"ඉඩ දෙන්න"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"පින්තුරයක් ගැනීම"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ඡායාරූපයක් තේරීම"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"පණිවිඩයක් යැවීම"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages හරහා ඡායාරූපය යවන ලදී"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages හරහා පණිවිඩය යවන ලදී"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"රූපය යවමින්..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">හදිසියි! කරුණාකර ගන්න!</string>
+  <string name="want_to_chat">කතාබස් කිරීමට අවශ්‍යද?</string>
+  <string name="quick_question">ඉක්මන් ප්‍රශ්නය…</string>
+  <string name="message_composer_custom_message_hint">අභිරුචි පණිවිඩයක් ලියන්න</string>
+  <string name="send_and_call">යවන්න සහ අමතන්න</string>
+  <string name="share_and_call">බෙදා ගෙන අමතන්න</string>
+  <string name="gallery_item_description">රූපය %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">රූපය</string>
+  <string name="camera_media_failure">කැමරා රූපය පූරණය කළ නොහැකි විය</string>
+  <string name="allow">ඉඩ දෙන්න</string>
+  <string name="camera_permission_text">ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න</string>
+  <string name="gallery_permission_text">රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න</string>
+  <string name="description_call_composer_camera">පින්තුරයක් ගැනීම</string>
+  <string name="description_call_composer_photo">ඡායාරූපයක් තේරීම</string>
+  <string name="description_call_composer_message">පණිවිඩයක් යැවීම</string>
+  <string name="image_sent_messages">Messages හරහා ඡායාරූපය යවන ලදී</string>
+  <string name="message_sent_messages">Messages හරහා පණිවිඩය යවන ලදී</string>
+  <string name="call_composer_image_uploading">රූපය යවමින්...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
index e478e6391..f6675f15b 100644
--- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Súrne! Zodvihnite, prosím."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Chcete četovať?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Rýchla otázka…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napíšte vlastnú správu"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Odoslať a zavolať"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Zdieľať a volať"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"obrázok – <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"obrázok"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Obrázok z fotoaparátu sa nepodarilo načítať"</string>
-    <string name="allow" msgid="8637148297403066623">"Povoliť"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Ak chcete fotiť, povoľte prístup k fotoaparátu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ak chcete zdieľať obrázok, povoľte prístup k médiám"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Odfotiť"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrať fotku"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Odoslať správu"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotka bola odoslaná prostredníctvom Správ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Správa bola odoslaná prostredníctvom Správ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Odosiela sa obrázok…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Súrne! Zodvihnite, prosím.</string>
+  <string name="want_to_chat">Chcete četovať?</string>
+  <string name="quick_question">Rýchla otázka…</string>
+  <string name="message_composer_custom_message_hint">Napíšte vlastnú správu</string>
+  <string name="send_and_call">Odoslať a zavolať</string>
+  <string name="share_and_call">Zdieľať a volať</string>
+  <string name="gallery_item_description">obrázok – %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">obrázok</string>
+  <string name="camera_media_failure">Obrázok z fotoaparátu sa nepodarilo načítať</string>
+  <string name="allow">Povoliť</string>
+  <string name="camera_permission_text">Ak chcete fotiť, povoľte prístup k fotoaparátu</string>
+  <string name="gallery_permission_text">Ak chcete zdieľať obrázok, povoľte prístup k médiám</string>
+  <string name="description_call_composer_camera">Odfotiť</string>
+  <string name="description_call_composer_photo">Vybrať fotku</string>
+  <string name="description_call_composer_message">Odoslať správu</string>
+  <string name="image_sent_messages">Fotka bola odoslaná prostredníctvom Správ</string>
+  <string name="message_sent_messages">Správa bola odoslaná prostredníctvom Správ</string>
+  <string name="call_composer_image_uploading">Odosiela sa obrázok…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
index 85dd23d99..86d734d4b 100644
--- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Nujno. Prosim, sprejmi."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želite klepetati?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kratko vprašanje …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite sporočilo po meri"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Pošlji in pokliči"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Klic s skupno rabo"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Slike fotoaparata ni bilo mogoče naložiti"</string>
-    <string name="allow" msgid="8637148297403066623">"Dovoli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Če želite posneti fotografijo, omogočite dostop do fotoaparata"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Posnemi fotografijo"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izberi fotografijo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošlji sporočilo"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je bila poslana prek aplikacije Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Sporočilo je bila poslano prek aplikacije Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Pošiljanje slike …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Nujno. Prosim, sprejmi.</string>
+  <string name="want_to_chat">Želite klepetati?</string>
+  <string name="quick_question">Kratko vprašanje …</string>
+  <string name="message_composer_custom_message_hint">Napišite sporočilo po meri</string>
+  <string name="send_and_call">Pošlji in pokliči</string>
+  <string name="share_and_call">Klic s skupno rabo</string>
+  <string name="gallery_item_description">slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Slike fotoaparata ni bilo mogoče naložiti</string>
+  <string name="allow">Dovoli</string>
+  <string name="camera_permission_text">Če želite posneti fotografijo, omogočite dostop do fotoaparata</string>
+  <string name="gallery_permission_text">Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti</string>
+  <string name="description_call_composer_camera">Posnemi fotografijo</string>
+  <string name="description_call_composer_photo">Izberi fotografijo</string>
+  <string name="description_call_composer_message">Pošlji sporočilo</string>
+  <string name="image_sent_messages">Fotografija je bila poslana prek aplikacije Messages</string>
+  <string name="message_sent_messages">Sporočilo je bila poslano prek aplikacije Messages</string>
+  <string name="call_composer_image_uploading">Pošiljanje slike …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
index aba7c8153..d82a440a1 100644
--- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Urgjente! Përgjigju!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Dëshiron të bisedosh?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Një pyetje e shpejtë…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Shkruaj mesazh të person."</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Dërgo dhe telefono"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Ndaj dhe telefono"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imazh <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imazh"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Imazhi i kamerës nuk mund të ngarkohej"</string>
-    <string name="allow" msgid="8637148297403066623">"Lejo"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Për të shkrepur një fotografi, jep qasjen te Kamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Për të ndarë një imazh, jep qasjen te Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Bëj një fotografi"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Zgjidh një fotografi"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Dërgo një mesazh"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografia u dërgua nëpërmjet \"Mesazheve\""</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesazhi u dërgua nëpërmjet \"Mesazheve\""</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Imazhi po dërgohet..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgjente! Përgjigju!</string>
+  <string name="want_to_chat">Dëshiron të bisedosh?</string>
+  <string name="quick_question">Një pyetje e shpejtë…</string>
+  <string name="message_composer_custom_message_hint">Shkruaj mesazh të person.</string>
+  <string name="send_and_call">Dërgo dhe telefono</string>
+  <string name="share_and_call">Ndaj dhe telefono</string>
+  <string name="gallery_item_description">imazh %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imazh</string>
+  <string name="camera_media_failure">Imazhi i kamerës nuk mund të ngarkohej</string>
+  <string name="allow">Lejo</string>
+  <string name="camera_permission_text">Për të shkrepur një fotografi, jep qasjen te Kamera</string>
+  <string name="gallery_permission_text">Për të ndarë një imazh, jep qasjen te Media</string>
+  <string name="description_call_composer_camera">Bëj një fotografi</string>
+  <string name="description_call_composer_photo">Zgjidh një fotografi</string>
+  <string name="description_call_composer_message">Dërgo një mesazh</string>
+  <string name="image_sent_messages">Fotografia u dërgua nëpërmjet \"Mesazheve\"</string>
+  <string name="message_sent_messages">Mesazhi u dërgua nëpërmjet \"Mesazheve\"</string>
+  <string name="call_composer_image_uploading">Imazhi po dërgohet...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
index ead04fce6..128085982 100644
--- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Хитно је! Јави се!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Желиш да ћаскаш?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Кратко питање…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напишите прилагођену поруку"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Пошаљи и позови"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Дели и позови"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"слика, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"слика"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Учитавање слике са камере није успело"</string>
-    <string name="allow" msgid="8637148297403066623">"Дозволи"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Одобрите приступ Камери да бисте снимили слику"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Одобрите приступ Медијима да бисте делили слику"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Сликајте"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изаберите слику"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Пошаљите поруку"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Слика је послата преко Messages-а"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Порука је послата преко Messages-а"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Шаље се слика…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Хитно је! Јави се!</string>
+  <string name="want_to_chat">Желиш да ћаскаш?</string>
+  <string name="quick_question">Кратко питање…</string>
+  <string name="message_composer_custom_message_hint">Напишите прилагођену поруку</string>
+  <string name="send_and_call">Пошаљи и позови</string>
+  <string name="share_and_call">Дели и позови</string>
+  <string name="gallery_item_description">слика, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">слика</string>
+  <string name="camera_media_failure">Учитавање слике са камере није успело</string>
+  <string name="allow">Дозволи</string>
+  <string name="camera_permission_text">Одобрите приступ Камери да бисте снимили слику</string>
+  <string name="gallery_permission_text">Одобрите приступ Медијима да бисте делили слику</string>
+  <string name="description_call_composer_camera">Сликајте</string>
+  <string name="description_call_composer_photo">Изаберите слику</string>
+  <string name="description_call_composer_message">Пошаљите поруку</string>
+  <string name="image_sent_messages">Слика је послата преко Messages-а</string>
+  <string name="message_sent_messages">Порука је послата преко Messages-а</string>
+  <string name="call_composer_image_uploading">Шаље се слика…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
index 0e37b296d..14f3c4b31 100644
--- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Viktig! Svara!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vill du chatta?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Snabb fråga …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv anpassat meddelande"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Skicka och ring"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Dela och ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"bild den <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bild"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Det gick inte att läsa in kamerabild"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillåt"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Bevilja åtkomst till Kamera om du vill ta ett foto"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Bevilja åtkomst till Media om du vill dela en bild"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta en bild"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Välj ett foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Skicka ett meddelande"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotot har skickats via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Meddelandet har skickats via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Skickar bild …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Viktig! Svara!</string>
+  <string name="want_to_chat">Vill du chatta?</string>
+  <string name="quick_question">Snabb fråga …</string>
+  <string name="message_composer_custom_message_hint">Skriv anpassat meddelande</string>
+  <string name="send_and_call">Skicka och ring</string>
+  <string name="share_and_call">Dela och ring</string>
+  <string name="gallery_item_description">bild den %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">bild</string>
+  <string name="camera_media_failure">Det gick inte att läsa in kamerabild</string>
+  <string name="allow">Tillåt</string>
+  <string name="camera_permission_text">Bevilja åtkomst till Kamera om du vill ta ett foto</string>
+  <string name="gallery_permission_text">Bevilja åtkomst till Media om du vill dela en bild</string>
+  <string name="description_call_composer_camera">Ta en bild</string>
+  <string name="description_call_composer_photo">Välj ett foto</string>
+  <string name="description_call_composer_message">Skicka ett meddelande</string>
+  <string name="image_sent_messages">Fotot har skickats via Messages</string>
+  <string name="message_sent_messages">Meddelandet har skickats via Messages</string>
+  <string name="call_composer_image_uploading">Skickar bild …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
index 03a7eaca5..fe7d33605 100644
--- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Ni muhimu! Chukua simu tafadhali!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Unataka kupiga gumzo?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Hebu nikuulize…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Andika ujumbe maalum"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Tuma na umpigie"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Shiriki na upige simu"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"picha <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"picha"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Imeshindwa kupakia picha ya kamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Ruhusu"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Ruhusu programu ifikie Kamera ili uweze kupiga picha"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ruhusu programu ifikie hifadhi ili uweze kushiriki picha"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Piga picha"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chagua picha"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Tuma ujumbe"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Picha imetumwa kupitia Programu ya Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Ujumbe umetumwa kupitia Programu ya Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Inatuma picha…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Ni muhimu! Chukua simu tafadhali!</string>
+  <string name="want_to_chat">Unataka kupiga gumzo?</string>
+  <string name="quick_question">Hebu nikuulize…</string>
+  <string name="message_composer_custom_message_hint">Andika ujumbe maalum</string>
+  <string name="send_and_call">Tuma na umpigie</string>
+  <string name="share_and_call">Shiriki na upige simu</string>
+  <string name="gallery_item_description">picha %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">picha</string>
+  <string name="camera_media_failure">Imeshindwa kupakia picha ya kamera</string>
+  <string name="allow">Ruhusu</string>
+  <string name="camera_permission_text">Ruhusu programu ifikie Kamera ili uweze kupiga picha</string>
+  <string name="gallery_permission_text">Ruhusu programu ifikie hifadhi ili uweze kushiriki picha</string>
+  <string name="description_call_composer_camera">Piga picha</string>
+  <string name="description_call_composer_photo">Chagua picha</string>
+  <string name="description_call_composer_message">Tuma ujumbe</string>
+  <string name="image_sent_messages">Picha imetumwa kupitia Programu ya Messages</string>
+  <string name="message_sent_messages">Ujumbe umetumwa kupitia Programu ya Messages</string>
+  <string name="call_composer_image_uploading">Inatuma picha…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
index e006ff9c1..ae90e4511 100644
--- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"அவசரம்! அழைப்பை எடுக்கவும்!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"அரட்டை அடிக்க வேண்டுமா?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"விரைவுக் கேள்வி…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"தனிப்பயன் செய்தியை எழுதவும்"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"அனுப்பி, அழை"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"பகிர்ந்து அழை"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"படம், <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"படம்"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"கேமரா படத்தை ஏற்ற முடியவில்லை"</string>
-    <string name="allow" msgid="8637148297403066623">"அனுமதி"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"படமெடுக்கவும்"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"புகைப்படத்தைத் தேர்வு செய்யும்"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"செய்தியை அனுப்பும்"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"படத்தை அனுப்புகிறது…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">அவசரம்! அழைப்பை எடுக்கவும்!</string>
+  <string name="want_to_chat">அரட்டை அடிக்க வேண்டுமா?</string>
+  <string name="quick_question">விரைவுக் கேள்வி…</string>
+  <string name="message_composer_custom_message_hint">தனிப்பயன் செய்தியை எழுதவும்</string>
+  <string name="send_and_call">அனுப்பி, அழை</string>
+  <string name="share_and_call">பகிர்ந்து அழை</string>
+  <string name="gallery_item_description">படம், %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">படம்</string>
+  <string name="camera_media_failure">கேமரா படத்தை ஏற்ற முடியவில்லை</string>
+  <string name="allow">அனுமதி</string>
+  <string name="camera_permission_text">படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்</string>
+  <string name="gallery_permission_text">படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்</string>
+  <string name="description_call_composer_camera">படமெடுக்கவும்</string>
+  <string name="description_call_composer_photo">புகைப்படத்தைத் தேர்வு செய்யும்</string>
+  <string name="description_call_composer_message">செய்தியை அனுப்பும்</string>
+  <string name="image_sent_messages">மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது</string>
+  <string name="message_sent_messages">மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது</string>
+  <string name="call_composer_image_uploading">படத்தை அனுப்புகிறது…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
index b3f46663e..22282bcb0 100644
--- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"అత్యవసరం! దయచేసి కాల్ ఎత్తండి!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"చాట్ చేయాలనుకుంటున్నారా?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"త్వరిత ప్రశ్న…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"అనుకూల సందేశాన్ని వ్రాయండి"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"పంపి, కాల్ చేయి"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"భాగస్వా. చేసి, కాల్ చేయి"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"చిత్రం <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"చిత్రం"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"కెమెరా చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="allow" msgid="8637148297403066623">"అనుమతించు"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"చిత్రాన్ని తీస్తుంది"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ఫోటోను ఎంచుకోండి"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"సందేశాన్ని పంపుతుంది"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"చిత్రాన్ని పంపుతోంది…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">అత్యవసరం! దయచేసి కాల్ ఎత్తండి!</string>
+  <string name="want_to_chat">చాట్ చేయాలనుకుంటున్నారా?</string>
+  <string name="quick_question">త్వరిత ప్రశ్న…</string>
+  <string name="message_composer_custom_message_hint">అనుకూల సందేశాన్ని వ్రాయండి</string>
+  <string name="send_and_call">పంపి, కాల్ చేయి</string>
+  <string name="share_and_call">భాగస్వా. చేసి, కాల్ చేయి</string>
+  <string name="gallery_item_description">చిత్రం %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">చిత్రం</string>
+  <string name="camera_media_failure">కెమెరా చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు</string>
+  <string name="allow">అనుమతించు</string>
+  <string name="camera_permission_text">ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి</string>
+  <string name="gallery_permission_text">చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి</string>
+  <string name="description_call_composer_camera">చిత్రాన్ని తీస్తుంది</string>
+  <string name="description_call_composer_photo">ఫోటోను ఎంచుకోండి</string>
+  <string name="description_call_composer_message">సందేశాన్ని పంపుతుంది</string>
+  <string name="image_sent_messages">సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము</string>
+  <string name="message_sent_messages">సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము</string>
+  <string name="call_composer_image_uploading">చిత్రాన్ని పంపుతోంది…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
index 125a24b58..180a7a7f8 100644
--- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"โปรดรับสายด่วน!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ต้องการแชทใช่ไหม"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ขอถามอะไรหน่อย…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"เขียนข้อความที่กำหนดเอง"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ส่งและโทร"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"แชร์และโทร"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"รูปภาพเมื่อวันที่ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"รูปภาพ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ไม่สามารถโหลดภาพจากกล้องได้"</string>
-    <string name="allow" msgid="8637148297403066623">"อนุญาต"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ถ่ายภาพ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"เลือกรูปภาพ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ส่งข้อความ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ส่งรูปภาพผ่าน Messages แล้ว"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ส่งข้อความผ่าน Messages แล้ว"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"กำลังส่งรูปภาพ..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">โปรดรับสายด่วน!</string>
+  <string name="want_to_chat">ต้องการแชทใช่ไหม</string>
+  <string name="quick_question">ขอถามอะไรหน่อย…</string>
+  <string name="message_composer_custom_message_hint">เขียนข้อความที่กำหนดเอง</string>
+  <string name="send_and_call">ส่งและโทร</string>
+  <string name="share_and_call">แชร์และโทร</string>
+  <string name="gallery_item_description">รูปภาพเมื่อวันที่ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">รูปภาพ</string>
+  <string name="camera_media_failure">ไม่สามารถโหลดภาพจากกล้องได้</string>
+  <string name="allow">อนุญาต</string>
+  <string name="camera_permission_text">หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง</string>
+  <string name="gallery_permission_text">หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ</string>
+  <string name="description_call_composer_camera">ถ่ายภาพ</string>
+  <string name="description_call_composer_photo">เลือกรูปภาพ</string>
+  <string name="description_call_composer_message">ส่งข้อความ</string>
+  <string name="image_sent_messages">ส่งรูปภาพผ่าน Messages แล้ว</string>
+  <string name="message_sent_messages">ส่งข้อความผ่าน Messages แล้ว</string>
+  <string name="call_composer_image_uploading">กำลังส่งรูปภาพ...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
index 7e7dac607..b96f93ce1 100644
--- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Apurahan! Pakisagot!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Gusto mo bang makipag-chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Maikling tanong…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Sumulat ng custom na mensahe"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Ipadala at tumawag"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Ibahagi at tumawag"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"larawan <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"larawan"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Hindi mai-load ang larawan ng camera"</string>
-    <string name="allow" msgid="8637148297403066623">"Payagan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Upang kumuha ng larawan, magbigay ng access sa Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Upang magbahagi ng imahe, magbigay ng access sa Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Kumuha ng larawan"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pumili ng larawan"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Magpadala ng mensahe"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Larawang ipinadala sa pamamagitan ng Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaheng ipinadala sa pamamagitan ng Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Ipinapadala ang larawan…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Apurahan! Pakisagot!</string>
+  <string name="want_to_chat">Gusto mo bang makipag-chat?</string>
+  <string name="quick_question">Maikling tanong…</string>
+  <string name="message_composer_custom_message_hint">Sumulat ng custom na mensahe</string>
+  <string name="send_and_call">Ipadala at tumawag</string>
+  <string name="share_and_call">Ibahagi at tumawag</string>
+  <string name="gallery_item_description">larawan %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">larawan</string>
+  <string name="camera_media_failure">Hindi mai-load ang larawan ng camera</string>
+  <string name="allow">Payagan</string>
+  <string name="camera_permission_text">Upang kumuha ng larawan, magbigay ng access sa Camera</string>
+  <string name="gallery_permission_text">Upang magbahagi ng imahe, magbigay ng access sa Media</string>
+  <string name="description_call_composer_camera">Kumuha ng larawan</string>
+  <string name="description_call_composer_photo">Pumili ng larawan</string>
+  <string name="description_call_composer_message">Magpadala ng mensahe</string>
+  <string name="image_sent_messages">Larawang ipinadala sa pamamagitan ng Messages</string>
+  <string name="message_sent_messages">Mensaheng ipinadala sa pamamagitan ng Messages</string>
+  <string name="call_composer_image_uploading">Ipinapadala ang larawan…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
index 99523d574..aabd2efca 100644
--- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Acil! Lütfen telefona cevap verin!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Sohbet etmek mi istiyorsunuz?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kısa soru…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Özel bir mesaj yazın"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Gönder ve telefon et"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Paylaş ve telefon et"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"resim <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"resim"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamera görüntüsü yüklenemedi"</string>
-    <string name="allow" msgid="8637148297403066623">"İzin ver"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Fotoğraf çekmek için Kamera\'ya erişim izni verin"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Resim paylaşmak için Medya\'ya erişim izni verin"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Resim çeker"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotoğraf seçilmesini sağlar"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj gönderir"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoğraf, Mesajlar uygulaması üzerinden gönderildi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj, Mesajlar uygulaması üzerinden gönderildi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Resim gönderiliyor…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Acil! Lütfen telefona cevap verin!</string>
+  <string name="want_to_chat">Sohbet etmek mi istiyorsunuz?</string>
+  <string name="quick_question">Kısa soru…</string>
+  <string name="message_composer_custom_message_hint">Özel bir mesaj yazın</string>
+  <string name="send_and_call">Gönder ve telefon et</string>
+  <string name="share_and_call">Paylaş ve telefon et</string>
+  <string name="gallery_item_description">resim %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">resim</string>
+  <string name="camera_media_failure">Kamera görüntüsü yüklenemedi</string>
+  <string name="allow">İzin ver</string>
+  <string name="camera_permission_text">Fotoğraf çekmek için Kamera\'ya erişim izni verin</string>
+  <string name="gallery_permission_text">Resim paylaşmak için Medya\'ya erişim izni verin</string>
+  <string name="description_call_composer_camera">Resim çeker</string>
+  <string name="description_call_composer_photo">Fotoğraf seçilmesini sağlar</string>
+  <string name="description_call_composer_message">Mesaj gönderir</string>
+  <string name="image_sent_messages">Fotoğraf, Mesajlar uygulaması üzerinden gönderildi</string>
+  <string name="message_sent_messages">Mesaj, Mesajlar uygulaması üzerinden gönderildi</string>
+  <string name="call_composer_image_uploading">Resim gönderiliyor…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
index fa57d3dea..9ec82a6fd 100644
--- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Терміново! Візьміть слухавку!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Хочете поспілкуватися?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Швидке запитання…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Ваше власне повідомлення"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Надіслати й зателефонувати"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Надіслати й зателефонувати"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"зображення <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"зображення"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не вдалося завантажити зображення з камери"</string>
-    <string name="allow" msgid="8637148297403066623">"Дозволити"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Щоб сфотографувати, надайте доступ до камери"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Щоб поділитися зображенням, надайте доступ до медіа-вмісту"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Зробити знімок"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Вибрати фотографію"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Надіслати повідомлення"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фотографію надіслано через додаток Повідомлення"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Текст надіслано через додаток Повідомлення"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Надсилання зображення…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Терміново! Візьміть слухавку!</string>
+  <string name="want_to_chat">Хочете поспілкуватися?</string>
+  <string name="quick_question">Швидке запитання…</string>
+  <string name="message_composer_custom_message_hint">Ваше власне повідомлення</string>
+  <string name="send_and_call">Надіслати й зателефонувати</string>
+  <string name="share_and_call">Надіслати й зателефонувати</string>
+  <string name="gallery_item_description">зображення %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">зображення</string>
+  <string name="camera_media_failure">Не вдалося завантажити зображення з камери</string>
+  <string name="allow">Дозволити</string>
+  <string name="camera_permission_text">Щоб сфотографувати, надайте доступ до камери</string>
+  <string name="gallery_permission_text">Щоб поділитися зображенням, надайте доступ до медіа-вмісту</string>
+  <string name="description_call_composer_camera">Зробити знімок</string>
+  <string name="description_call_composer_photo">Вибрати фотографію</string>
+  <string name="description_call_composer_message">Надіслати повідомлення</string>
+  <string name="image_sent_messages">Фотографію надіслано через додаток Повідомлення</string>
+  <string name="message_sent_messages">Текст надіслано через додаток Повідомлення</string>
+  <string name="call_composer_image_uploading">Надсилання зображення…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
index 2677bd22b..e075a2d0b 100644
--- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"ارجنٹ! براہ کرم فون اٹھائیں!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"چیٹ کرنا چاہتے ہیں؟"</string>
-    <string name="quick_question" msgid="3501160802390214092">"فوری سوال…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ایک حسب ضرورت پیغام لکھیں"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"بھیجیں اور کال کریں"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"اشتراک کریں اور کال کریں"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"تصویر <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"تصویر"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"کیمرے کی تصویر لوڈ نہیں ہو سکی"</string>
-    <string name="allow" msgid="8637148297403066623">"اجازت دیں"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"تصویر لینے کیلئے کیمرا کو رسائی دیں"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"تصویر لیں"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ایک تصویر چنیں"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"پیغام بھیجیں"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"تصویر پیغامات کے ذریعے بھیجی گئی"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"پیغام پیغامات کے ذریعے بھیجا گیا"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"تصویر بھیجی جا رہی ہے…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ارجنٹ! براہ کرم فون اٹھائیں!</string>
+  <string name="want_to_chat">چیٹ کرنا چاہتے ہیں؟</string>
+  <string name="quick_question">فوری سوال…</string>
+  <string name="message_composer_custom_message_hint">ایک حسب ضرورت پیغام لکھیں</string>
+  <string name="send_and_call">بھیجیں اور کال کریں</string>
+  <string name="share_and_call">اشتراک کریں اور کال کریں</string>
+  <string name="gallery_item_description">تصویر %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">تصویر</string>
+  <string name="camera_media_failure">کیمرے کی تصویر لوڈ نہیں ہو سکی</string>
+  <string name="allow">اجازت دیں</string>
+  <string name="camera_permission_text">تصویر لینے کیلئے کیمرا کو رسائی دیں</string>
+  <string name="gallery_permission_text">تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں</string>
+  <string name="description_call_composer_camera">تصویر لیں</string>
+  <string name="description_call_composer_photo">ایک تصویر چنیں</string>
+  <string name="description_call_composer_message">پیغام بھیجیں</string>
+  <string name="image_sent_messages">تصویر پیغامات کے ذریعے بھیجی گئی</string>
+  <string name="message_sent_messages">پیغام پیغامات کے ذریعے بھیجا گیا</string>
+  <string name="call_composer_image_uploading">تصویر بھیجی جا رہی ہے…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
index 79152b544..abe2f4f64 100644
--- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Juda shoshilinch! Iltimos, go‘shakni ko‘taring!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Chatda suhbatlashasizmi?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Bir kichik savol…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Boshqa xabar yozing"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Yuborish va qo‘ng‘iroq qilish"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Ulashish va chaqirish"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"tasvir, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"tasvir"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamera orqali olingan suratni yuklab bo‘lmadi"</string>
-    <string name="allow" msgid="8637148297403066623">"Ruxsat berish"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Suratga olish uchun kameraga kirshga ruxsat bering"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Rasmga olish"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Rasm tanlash"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Xabar yuborish"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Rasm Android Xabarlar orqali yuborildi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Xabar Android Xabarlar orqali yuborildi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Tasvir yuborilmoqda…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Juda shoshilinch! Iltimos, go‘shakni ko‘taring!</string>
+  <string name="want_to_chat">Chatda suhbatlashasizmi?</string>
+  <string name="quick_question">Bir kichik savol…</string>
+  <string name="message_composer_custom_message_hint">Boshqa xabar yozing</string>
+  <string name="send_and_call">Yuborish va qo‘ng‘iroq qilish</string>
+  <string name="share_and_call">Ulashish va chaqirish</string>
+  <string name="gallery_item_description">tasvir, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">tasvir</string>
+  <string name="camera_media_failure">Kamera orqali olingan suratni yuklab bo‘lmadi</string>
+  <string name="allow">Ruxsat berish</string>
+  <string name="camera_permission_text">Suratga olish uchun kameraga kirshga ruxsat bering</string>
+  <string name="gallery_permission_text">Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering</string>
+  <string name="description_call_composer_camera">Rasmga olish</string>
+  <string name="description_call_composer_photo">Rasm tanlash</string>
+  <string name="description_call_composer_message">Xabar yuborish</string>
+  <string name="image_sent_messages">Rasm Android Xabarlar orqali yuborildi</string>
+  <string name="message_sent_messages">Xabar Android Xabarlar orqali yuborildi</string>
+  <string name="call_composer_image_uploading">Tasvir yuborilmoqda…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
index f065f17d0..56e9736ef 100644
--- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Khẩn cấp! Vui lòng chọn!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Bạn muốn trò chuyện?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Câu hỏi nhanh…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Viết tin nhắn tùy chỉnh"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Gửi và gọi"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Chia sẻ và gọi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"hình ảnh <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"hình ảnh"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Không thể tải hình ảnh trong máy ảnh"</string>
-    <string name="allow" msgid="8637148297403066623">"Cho phép"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Chụp ảnh"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chọn ảnh"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Gửi tin nhắn"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Đã gửi ảnh qua Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Đã gửi tin nhắn qua Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Đang gửi hình ảnh..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Khẩn cấp! Vui lòng chọn!</string>
+  <string name="want_to_chat">Bạn muốn trò chuyện?</string>
+  <string name="quick_question">Câu hỏi nhanh…</string>
+  <string name="message_composer_custom_message_hint">Viết tin nhắn tùy chỉnh</string>
+  <string name="send_and_call">Gửi và gọi</string>
+  <string name="share_and_call">Chia sẻ và gọi</string>
+  <string name="gallery_item_description">hình ảnh %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">hình ảnh</string>
+  <string name="camera_media_failure">Không thể tải hình ảnh trong máy ảnh</string>
+  <string name="allow">Cho phép</string>
+  <string name="camera_permission_text">Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh</string>
+  <string name="gallery_permission_text">Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện</string>
+  <string name="description_call_composer_camera">Chụp ảnh</string>
+  <string name="description_call_composer_photo">Chọn ảnh</string>
+  <string name="description_call_composer_message">Gửi tin nhắn</string>
+  <string name="image_sent_messages">Đã gửi ảnh qua Messages</string>
+  <string name="message_sent_messages">Đã gửi tin nhắn qua Messages</string>
+  <string name="call_composer_image_uploading">Đang gửi hình ảnh...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
index 0bb323fe8..09b959742 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"紧急！请接听！"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"想要聊天？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"快速提问…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"自行撰写信息"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"发送信息并拨打电话"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"分享并拨打电话"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"图片（<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>）"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"图片"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"无法加载相机图片"</string>
-    <string name="allow" msgid="8637148297403066623">"允许"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"要拍摄照片，请授予相机使用权限"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"要分享图片，请授予媒体访问权限"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"选择一张照片"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"发送信息"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"已通过“信息”应用发送照片"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"已通过“信息”应用发送短信"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在发送图片…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">紧急！请接听！</string>
+  <string name="want_to_chat">想要聊天？</string>
+  <string name="quick_question">快速提问…</string>
+  <string name="message_composer_custom_message_hint">自行撰写信息</string>
+  <string name="send_and_call">发送信息并拨打电话</string>
+  <string name="share_and_call">分享并拨打电话</string>
+  <string name="gallery_item_description">图片（%1$tB %1$te %1$tY %1$tl %1$tM %1$tp）</string>
+  <string name="gallery_item_description_no_date">图片</string>
+  <string name="camera_media_failure">无法加载相机图片</string>
+  <string name="allow">允许</string>
+  <string name="camera_permission_text">要拍摄照片，请授予相机使用权限</string>
+  <string name="gallery_permission_text">要分享图片，请授予媒体访问权限</string>
+  <string name="description_call_composer_camera">拍照</string>
+  <string name="description_call_composer_photo">选择一张照片</string>
+  <string name="description_call_composer_message">发送信息</string>
+  <string name="image_sent_messages">已通过“信息”应用发送照片</string>
+  <string name="message_sent_messages">已通过“信息”应用发送短信</string>
+  <string name="call_composer_image_uploading">正在发送图片…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
index 5b70bbcbc..9f88ab00f 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"緊急來電，請接起！"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"想使用即時通訊？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"簡短問題…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"撰寫自訂訊息"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"傳送並致電"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"分享並通話"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"圖片：<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"圖片"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"無法載入相機圖片"</string>
-    <string name="allow" msgid="8637148297403066623">"允許"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予「相機」存取權"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予「媒體」存取權"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"已透過「訊息」傳送相片"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"已透過「訊息」傳送訊息"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在傳送圖片…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">緊急來電，請接起！</string>
+  <string name="want_to_chat">想使用即時通訊？</string>
+  <string name="quick_question">簡短問題…</string>
+  <string name="message_composer_custom_message_hint">撰寫自訂訊息</string>
+  <string name="send_and_call">傳送並致電</string>
+  <string name="share_and_call">分享並通話</string>
+  <string name="gallery_item_description">圖片：%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">圖片</string>
+  <string name="camera_media_failure">無法載入相機圖片</string>
+  <string name="allow">允許</string>
+  <string name="camera_permission_text">如要拍照，請授予「相機」存取權</string>
+  <string name="gallery_permission_text">如要分享圖片，請授予「媒體」存取權</string>
+  <string name="description_call_composer_camera">拍照</string>
+  <string name="description_call_composer_photo">選擇相片</string>
+  <string name="description_call_composer_message">傳送訊息</string>
+  <string name="image_sent_messages">已透過「訊息」傳送相片</string>
+  <string name="message_sent_messages">已透過「訊息」傳送訊息</string>
+  <string name="call_composer_image_uploading">正在傳送圖片…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
index 3f1eaf092..9e13aee86 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"緊急！請接聽來電！"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"想聊聊天嗎？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"簡單的問題…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"撰寫自訂訊息"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"傳送並撥號"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"分享及撥號"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"圖片：<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"圖片"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"無法載入相機圖片"</string>
-    <string name="allow" msgid="8637148297403066623">"允許"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予相機存取權"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予媒體存取權"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"拍攝相片"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"透過訊息應用程式傳送的相片"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"透過訊息應用程式傳送的訊息"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在傳送圖片…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">緊急！請接聽來電！</string>
+  <string name="want_to_chat">想聊聊天嗎？</string>
+  <string name="quick_question">簡單的問題…</string>
+  <string name="message_composer_custom_message_hint">撰寫自訂訊息</string>
+  <string name="send_and_call">傳送並撥號</string>
+  <string name="share_and_call">分享及撥號</string>
+  <string name="gallery_item_description">圖片：%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">圖片</string>
+  <string name="camera_media_failure">無法載入相機圖片</string>
+  <string name="allow">允許</string>
+  <string name="camera_permission_text">如要拍照，請授予相機存取權</string>
+  <string name="gallery_permission_text">如要分享圖片，請授予媒體存取權</string>
+  <string name="description_call_composer_camera">拍攝相片</string>
+  <string name="description_call_composer_photo">選擇相片</string>
+  <string name="description_call_composer_message">傳送訊息</string>
+  <string name="image_sent_messages">透過訊息應用程式傳送的相片</string>
+  <string name="message_sent_messages">透過訊息應用程式傳送的訊息</string>
+  <string name="call_composer_image_uploading">正在傳送圖片…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
index 682febc57..b4df24f25 100644
--- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
@@ -1,38 +1,21 @@
-<?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="urgent" msgid="5271653973625093934">"Kuyashesha! Sicela ukhethe!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ufuna ukuxoxa?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Umbuzo osheshayo…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Bhala umlayezo wangokwezifiso"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Thumela ushayele"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Yabelana uphinde ushaye"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"isithombe sangomhla ka-<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"isithombe"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Ayikwazanga ukulayisha isithombe sekhamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Vumela"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Ukuze uthathe isithombe, nika ukufinyelela kukhamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Thatha isithombe"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Khetha isithombe"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Thumela umlayezo"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Isithombe sithunyelwe ngemilayezo"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Umlayezo uthunyelwe ngemilayezo"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Ithumela isithombe..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Kuyashesha! Sicela ukhethe!</string>
+  <string name="want_to_chat">Ufuna ukuxoxa?</string>
+  <string name="quick_question">Umbuzo osheshayo…</string>
+  <string name="message_composer_custom_message_hint">Bhala umlayezo wangokwezifiso</string>
+  <string name="send_and_call">Thumela ushayele</string>
+  <string name="share_and_call">Yabelana uphinde ushaye</string>
+  <string name="gallery_item_description">isithombe sangomhla ka-%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">isithombe</string>
+  <string name="camera_media_failure">Ayikwazanga ukulayisha isithombe sekhamera</string>
+  <string name="allow">Vumela</string>
+  <string name="camera_permission_text">Ukuze uthathe isithombe, nika ukufinyelela kukhamera</string>
+  <string name="gallery_permission_text">Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya</string>
+  <string name="description_call_composer_camera">Thatha isithombe</string>
+  <string name="description_call_composer_photo">Khetha isithombe</string>
+  <string name="description_call_composer_message">Thumela umlayezo</string>
+  <string name="image_sent_messages">Isithombe sithunyelwe ngemilayezo</string>
+  <string name="message_sent_messages">Umlayezo uthunyelwe ngemilayezo</string>
+  <string name="call_composer_image_uploading">Ithumela isithombe...</string>
 </resources>
-- 
cgit v1.2.3