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

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

diff --git a/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml
index 86d4c7873..27ed5009c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Beperk"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privaat nommer"</string>
+<resources>
+  <string name="private_num_verizon">Beperk</string>
+  <string name="private_num_non_verizon">Privaat nommer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml
index 117d96c6a..6127163ed 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ተገድቧል"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"የግል ቁጥር"</string>
+<resources>
+  <string name="private_num_verizon">ተገድቧል</string>
+  <string name="private_num_non_verizon">የግል ቁጥር</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml
index 72e5f40bb..af8a56808 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"مقيّد"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"رقم خاص"</string>
+<resources>
+  <string name="private_num_verizon">محظور  </string>
+  <string name="private_num_non_verizon">رقم خاص</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml
index c6010af56..fe93ace49 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Məhdudlaşdırılmış"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Gizli nömrə"</string>
+<resources>
+  <string name="private_num_verizon">Məhdudlaşdırılmış</string>
+  <string name="private_num_non_verizon">Gizli nömrə</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml
index bab794cfa..4012a0f80 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ograničeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatan broj"</string>
+<resources>
+  <string name="private_num_verizon">Ograničeno</string>
+  <string name="private_num_non_verizon">Privatan broj</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml
index 94ed613fa..563c703dc 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Абмежавана"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Прыватны нумар"</string>
+<resources>
+  <string name="private_num_verizon">Абмежавана</string>
+  <string name="private_num_non_verizon">Прыватны нумар</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml
index 59a1c5673..71f609045 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ограничен"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Частен номер"</string>
+<resources>
+  <string name="private_num_verizon">Ограничен</string>
+  <string name="private_num_non_verizon">Частен номер</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml
index 16dbe8e3b..b08721ad5 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"বিধিনিষেধযুক্ত"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ব্যক্তিগত নম্বর"</string>
+<resources>
+  <string name="private_num_verizon">বিধিনিষেধযুক্ত</string>
+  <string name="private_num_non_verizon">ব্যক্তিগত নম্বর</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml
index 444bce08e..54fa43eb2 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ograničeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatni broj"</string>
+<resources>
+  <string name="private_num_verizon">Ograničeno</string>
+  <string name="private_num_non_verizon">Privatni broj</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml
index 917bc3a14..e9ccb4c78 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restringit"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privat"</string>
+<resources>
+  <string name="private_num_verizon">Restringit</string>
+  <string name="private_num_non_verizon">Número privat</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml
index 57e0049e5..7c225fa54 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Omezeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Soukromé číslo"</string>
+<resources>
+  <string name="private_num_verizon">Omezeno</string>
+  <string name="private_num_non_verizon">Soukromé číslo</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml
index 16fa7e5bd..e9975f4d0 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Privat"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privat nummer"</string>
+<resources>
+  <string name="private_num_verizon">Privat</string>
+  <string name="private_num_non_verizon">Privat nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml
index cd1ae233b..01d68032b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Beschränkt"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private Nummer"</string>
+<resources>
+  <string name="private_num_verizon">Beschränkt</string>
+  <string name="private_num_non_verizon">Private Nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml
index 50cbd8b2e..e1782c844 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Περιορισμένος"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Απόκρυψη αριθμού"</string>
+<resources>
+  <string name="private_num_verizon">Περιορισμένος</string>
+  <string name="private_num_non_verizon">Απόκρυψη αριθμού</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml
index e5db44b79..8e85d0bd0 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restricted"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private number"</string>
+<resources>
+  <string name="private_num_verizon">Restricted</string>
+  <string name="private_num_non_verizon">Private number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml
index e5db44b79..8e85d0bd0 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restricted"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private number"</string>
+<resources>
+  <string name="private_num_verizon">Restricted</string>
+  <string name="private_num_non_verizon">Private number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml
index e5db44b79..8e85d0bd0 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restricted"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private number"</string>
+<resources>
+  <string name="private_num_verizon">Restricted</string>
+  <string name="private_num_non_verizon">Private number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml
index 279a537f3..7515f3215 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restringido"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restringido</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml
index eb6ec7619..637d0723b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restringidas"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restringidas</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml
index b1affbd2f..bf886ffa6 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Piiratud"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Varjatud number"</string>
+<resources>
+  <string name="private_num_verizon">Piiratud</string>
+  <string name="private_num_non_verizon">Varjatud number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml
index 41dcfccdf..5ac836fa3 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Murriztua"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Zenbaki pribatua"</string>
+<resources>
+  <string name="private_num_verizon">Murriztua</string>
+  <string name="private_num_non_verizon">Zenbaki pribatua</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml
index dd6908d45..6b3d2c84d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"محدودشده"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"شماره خصوصی"</string>
+<resources>
+  <string name="private_num_verizon">محدودشده</string>
+  <string name="private_num_non_verizon">شماره خصوصی</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml
index 0d901c467..eb7ff9f18 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Rajoitettu"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Yksityinen numero"</string>
+<resources>
+  <string name="private_num_verizon">Rajoitettu</string>
+  <string name="private_num_non_verizon">Yksityinen numero</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml
index 1915d9d2e..4949bba37 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Numéro privé"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numéro privé"</string>
+<resources>
+  <string name="private_num_verizon">Numéro privé</string>
+  <string name="private_num_non_verizon">Numéro privé</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml
index 372f122f6..37ae694dd 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restreint"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numéro privé"</string>
+<resources>
+  <string name="private_num_verizon">Restreint</string>
+  <string name="private_num_non_verizon">Numéro privé</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml
index d034dad11..1a001c3b4 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restrinxido"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restrinxido</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml
index e2aef446b..4c3b0672d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"પ્રતિબંધિત"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ખાનગી નંબર"</string>
+<resources>
+  <string name="private_num_verizon">પ્રતિબંધિત</string>
+  <string name="private_num_non_verizon">ખાનગી નંબર</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml
index 4b6049046..5a6ba896e 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"प्रतिबंधित"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"निजी नंबर"</string>
+<resources>
+  <string name="private_num_verizon">प्रतिबंधित</string>
+  <string name="private_num_non_verizon">निजी नंबर</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml
index 444bce08e..54fa43eb2 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ograničeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatni broj"</string>
+<resources>
+  <string name="private_num_verizon">Ograničeno</string>
+  <string name="private_num_non_verizon">Privatni broj</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml
index 17ce312dc..c54d830ba 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Korlátozott"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Magántelefonszám"</string>
+<resources>
+  <string name="private_num_verizon">Korlátozott</string>
+  <string name="private_num_non_verizon">Magántelefonszám</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml
index fe1a48f2d..3fc82ef53 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Սահմանափակված"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Փակ համար"</string>
+<resources>
+  <string name="private_num_verizon">Սահմանափակված</string>
+  <string name="private_num_non_verizon">Փակ համար</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml
index 844d704a8..713666d5c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Dibatasi"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Nomor pribadi"</string>
+<resources>
+  <string name="private_num_verizon">Dibatasi</string>
+  <string name="private_num_non_verizon">Nomor pribadi</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml
index c2b14409d..cbc6c28de 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Einkanúmer"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Leyninúmer"</string>
+<resources>
+  <string name="private_num_verizon">Einkanúmer</string>
+  <string name="private_num_non_verizon">Leyninúmer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml
index c8f8fed75..1f80844bd 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Limitata"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numero privato"</string>
+<resources>
+  <string name="private_num_verizon">Limitata</string>
+  <string name="private_num_non_verizon">Numero privato</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml
index 25d55b158..3844682cb 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"מספר חסום"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"מספר פרטי"</string>
+<resources>
+  <string name="private_num_verizon">מספר חסום</string>
+  <string name="private_num_non_verizon">מספר פרטי</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml
index 1e2b09ba4..f28d08f7f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"制限されています"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"非通知設定"</string>
+<resources>
+  <string name="private_num_verizon">制限されています</string>
+  <string name="private_num_non_verizon">非通知設定</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml
index 8bc1b6fe1..421b61600 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"შეზღუდული"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"დაფარული ნომერი"</string>
+<resources>
+  <string name="private_num_verizon">შეზღუდული</string>
+  <string name="private_num_non_verizon">დაფარული ნომერი</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml
index 1679a139d..24a06f894 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Шектелген"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Жеке нөмір"</string>
+<resources>
+  <string name="private_num_verizon">Шектелген</string>
+  <string name="private_num_non_verizon">Жеке нөмір</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml
index d079ad492..cf32395c2 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"បាន​ដាក់​កម្រិត"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"លេខ​ឯកជន"</string>
+<resources>
+  <string name="private_num_verizon">បាន​ដាក់​កម្រិត</string>
+  <string name="private_num_non_verizon">លេខ​ឯកជន</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml
index 982cee59e..e1c8194a5 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ಖಾಸಗಿ ಸಂಖ್ಯೆ"</string>
+<resources>
+  <string name="private_num_verizon">ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
+  <string name="private_num_non_verizon">ಖಾಸಗಿ ಸಂಖ್ಯೆ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml
index 72b4c7ce7..ead9f7a4b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"제한됨"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"비공개 번호"</string>
+<resources>
+  <string name="private_num_verizon">제한됨</string>
+  <string name="private_num_non_verizon">비공개 번호</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml
index 5470991a0..d64aa748e 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Чектелген"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Купуя номер"</string>
+<resources>
+  <string name="private_num_verizon">Чектелген</string>
+  <string name="private_num_non_verizon">Купуя номер</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml
index 5c980bf7e..3b4cfa386 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ຖືກຈຳກັດ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ເບີສ່ວນຕົວ"</string>
+<resources>
+  <string name="private_num_verizon">ຖືກຈຳກັດ</string>
+  <string name="private_num_non_verizon">ເບີສ່ວນຕົວ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml
index 3374aae4d..1df01339a 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Apriboti"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatus numeris"</string>
+<resources>
+  <string name="private_num_verizon">Apriboti</string>
+  <string name="private_num_non_verizon">Privatus numeris</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml
index 02eb2ea8e..c6dd574a1 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ierobežots"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privāts numurs"</string>
+<resources>
+  <string name="private_num_verizon">Ierobežots</string>
+  <string name="private_num_non_verizon">Privāts numurs</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml
index c5d670b76..ba79acf0b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ограничено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Приватен број"</string>
+<resources>
+  <string name="private_num_verizon">Ограничено</string>
+  <string name="private_num_non_verizon">Приватен број</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml
index de8de2f3d..f6898357a 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"നിയന്ത്രിച്ചിരിക്കുന്നു"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"സ്വകാര്യ നമ്പർ"</string>
+<resources>
+  <string name="private_num_verizon">നിയന്ത്രിച്ചിരിക്കുന്നു</string>
+  <string name="private_num_non_verizon">സ്വകാര്യ നമ്പർ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml
index a496dc787..eeefc0b59 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Хязгаарлагдсан"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Нууцалсан дугаар"</string>
+<resources>
+  <string name="private_num_verizon">Хязгаарлагдсан</string>
+  <string name="private_num_non_verizon">Нууцалсан дугаар</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml
index 3e6f9e0f2..228678108 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"प्रतिबंधित"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"खाजगी नंबर"</string>
+<resources>
+  <string name="private_num_verizon">प्रतिबंधित</string>
+  <string name="private_num_non_verizon">खाजगी नंबर</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml
index 8f0a9453d..07106b5a9 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Terhad"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Nombor peribadi"</string>
+<resources>
+  <string name="private_num_verizon">Terhad</string>
+  <string name="private_num_non_verizon">Nombor peribadi</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml
index 7001f8adf..8f67cddc4 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ကန့်သတ်ထားသည်"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ပုဂ္ဂလိကဖုန်းနံပါတ်"</string>
+<resources>
+  <string name="private_num_verizon">ကန့်သတ်ထားသည်</string>
+  <string name="private_num_non_verizon">ပုဂ္ဂလိကဖုန်းနံပါတ်</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml
index 26d252b1f..8a3fe1daf 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Begrenset"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Skjult nummer"</string>
+<resources>
+  <string name="private_num_verizon">Begrenset</string>
+  <string name="private_num_non_verizon">Skjult nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml
index 6332ec3f3..d6b66aa60 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"प्रतिबन्धित"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"निजी नम्बर"</string>
+<resources>
+  <string name="private_num_verizon">प्रतिबन्धित</string>
+  <string name="private_num_non_verizon">निजी नम्बर</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml
index 358fa99a8..2813a9fca 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Beperkt"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privénummer"</string>
+<resources>
+  <string name="private_num_verizon">Beperkt</string>
+  <string name="private_num_non_verizon">Privénummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml
index 26d252b1f..8a3fe1daf 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Begrenset"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Skjult nummer"</string>
+<resources>
+  <string name="private_num_verizon">Begrenset</string>
+  <string name="private_num_non_verizon">Skjult nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml
index 6cd29a299..00f704546 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ਪ੍ਰਤੀਬੰਧਿਤ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ਨਿੱਜੀ ਨੰਬਰ"</string>
+<resources>
+  <string name="private_num_verizon">ਪ੍ਰਤੀਬੰਧਿਤ</string>
+  <string name="private_num_non_verizon">ਨਿੱਜੀ ਨੰਬਰ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml
index 712a3c6f5..312b87e58 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Zastrzeżone"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numer prywatny"</string>
+<resources>
+  <string name="private_num_verizon">Zastrzeżone</string>
+  <string name="private_num_non_verizon">Numer prywatny</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml
index 5241b1625..495ad7d6c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restrito"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número particular"</string>
+<resources>
+  <string name="private_num_verizon">Restrito</string>
+  <string name="private_num_non_verizon">Número particular</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml
index c41cc3600..a1450039f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restrito"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restrito</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml
index 5241b1625..495ad7d6c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restrito"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número particular"</string>
+<resources>
+  <string name="private_num_verizon">Restrito</string>
+  <string name="private_num_non_verizon">Número particular</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml
index bd1a3129b..03a0e01cb 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Restricționat"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Număr privat"</string>
+<resources>
+  <string name="private_num_verizon">Restricționat</string>
+  <string name="private_num_non_verizon">Număr privat</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml
index ae9ed81fa..c6e535680 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ограничено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Частный номер"</string>
+<resources>
+  <string name="private_num_verizon">Ограничено</string>
+  <string name="private_num_non_verizon">Номер скрыт</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml
index 3da9971c5..360a2fbe8 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"සීමා කළ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"පුද්ගලික අංකය"</string>
+<resources>
+  <string name="private_num_verizon">සීමා කළ</string>
+  <string name="private_num_non_verizon">පුද්ගලික අංකය</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml
index f127ab6e9..22abe594d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Obmedzené"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Súkromné číslo"</string>
+<resources>
+  <string name="private_num_verizon">Obmedzené</string>
+  <string name="private_num_non_verizon">Súkromné číslo</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml
index 6d44c5ba6..5be25d4df 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Omejeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Zasebna številka"</string>
+<resources>
+  <string name="private_num_verizon">Omejeno</string>
+  <string name="private_num_non_verizon">Zasebna številka</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml
index 13035f4cd..3f1c3e4aa 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"I kufizuar"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numër privat"</string>
+<resources>
+  <string name="private_num_verizon">I kufizuar</string>
+  <string name="private_num_non_verizon">Numër privat</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml
index a6732e7dc..680347297 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Ограничено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Приватан број"</string>
+<resources>
+  <string name="private_num_verizon">Ограничено</string>
+  <string name="private_num_non_verizon">Приватан број</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml
index 187e2ada8..a61872cb5 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Hemligt nummer"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privat nummer"</string>
+<resources>
+  <string name="private_num_verizon">Hemligt nummer</string>
+  <string name="private_num_non_verizon">Privat nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml
index 94472c43f..26ed3fca0 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Zilizozuiwa"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Nambari isiyojulikana"</string>
+<resources>
+  <string name="private_num_verizon">Zilizozuiwa</string>
+  <string name="private_num_non_verizon">Nambari isiyojulikana</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml
index 4b7796dbc..5f64e670c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"வரம்பிட்டவை"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"தனிப்பட்ட எண்"</string>
+<resources>
+  <string name="private_num_verizon">வரம்பிட்டவை</string>
+  <string name="private_num_non_verizon">தனிப்பட்ட எண்</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml
index 0bbae69b1..95a0f7809 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"నియంత్రించబడింది"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ప్రైవేట్ నంబర్"</string>
+<resources>
+  <string name="private_num_verizon">నియంత్రించబడింది</string>
+  <string name="private_num_non_verizon">ప్రైవేట్ నంబర్</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml
index ba8a64ae2..78c5f72d6 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ถูกจำกัด"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"หมายเลขส่วนตัว"</string>
+<resources>
+  <string name="private_num_verizon">ถูกจำกัด</string>
+  <string name="private_num_non_verizon">หมายเลขส่วนตัว</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml
index 90e4a89fe..f15f069f1 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Pinaghihigpitan"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Pribadong numero"</string>
+<resources>
+  <string name="private_num_verizon">Pinaghihigpitan</string>
+  <string name="private_num_non_verizon">Pribadong numero</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml
index 93905ab74..22e49f3d6 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Kısıtlanmış"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Özel numara"</string>
+<resources>
+  <string name="private_num_verizon">Kısıtlanmış</string>
+  <string name="private_num_non_verizon">Özel numara</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml
index b3749585e..fd4881c96 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Обмежено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Приватний номер"</string>
+<resources>
+  <string name="private_num_verizon">Обмежено</string>
+  <string name="private_num_non_verizon">Приватний номер</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml
index 5812528a1..52358ef7b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"ممنوع"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"نجی نمبر"</string>
+<resources>
+  <string name="private_num_verizon">ممنوع</string>
+  <string name="private_num_non_verizon">نجی نمبر</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml
index b1d033287..050478180 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Cheklangan"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Maxfiy raqam"</string>
+<resources>
+  <string name="private_num_verizon">Cheklangan</string>
+  <string name="private_num_non_verizon">Maxfiy raqam</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml
index 12092f603..bbd2a5897 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Bị giới hạn"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Số cá nhân"</string>
+<resources>
+  <string name="private_num_verizon">Bị giới hạn</string>
+  <string name="private_num_non_verizon">Số cá nhân</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml
index e269781df..40c3213b0 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"受限"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"私密号码"</string>
+<resources>
+  <string name="private_num_verizon">受限</string>
+  <string name="private_num_non_verizon">私密号码</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml
index 6020b25b8..e687a5fff 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"受限制"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"私人號碼"</string>
+<resources>
+  <string name="private_num_verizon">受限制</string>
+  <string name="private_num_non_verizon">私人號碼</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml
index 20adc6577..a497b175b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"受限"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"私人號碼"</string>
+<resources>
+  <string name="private_num_verizon">受限</string>
+  <string name="private_num_non_verizon">私人號碼</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml
index db421affa..22cc7eab3 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT 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="private_num_verizon" msgid="3281061244372204957">"Kuvinjelwe"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Inombolo eyimfihlo"</string>
+<resources>
+  <string name="private_num_verizon">Kuvinjelwe</string>
+  <string name="private_num_non_verizon">Inombolo eyimfihlo</string>
 </resources>
-- 
cgit v1.2.3