14 files changed, 71 insertions, 316 deletions
diff --git a/packages/VpnDialogs/res/values-as-rIN/strings.xml b/packages/VpnDialogs/res/values-as-rIN/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-as-rIN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-ast-rES/strings.xml b/packages/VpnDialogs/res/values-ast-rES/strings.xml
index c37f11a2401..68e6768d19d 100644
--- a/packages/VpnDialogs/res/values-ast-rES/strings.xml
+++ b/packages/VpnDialogs/res/values-ast-rES/strings.xml
@@ -15,24 +15,23 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <string name="warning"><xliff:g id="app">%s</xliff:g> quier configurar una conexón VPN
-        que permita monitorizar el tráficu de rede. Aceuta namái si tas enfotáu
+    <string name="prompt">Solicitú de conexón</string>
+    <string name="warning"><xliff:g id="app">%s</xliff:g> quier configurar una conexón VPN
+        que permita supervisar el tráficu de rede. Aceuta namái si tas enfotáu
         na fonte.
-        <![CDATA[
-        <br />
-        <br />
-        <img src="vpn_icon" />
-        ]]> apaez no cimero de la to pantalla al activase la VPN.
+                &lt;br /&gt;
+        &lt;br /&gt;
+        &lt;img src="vpn_icon" /&gt;
+         apaez no cimero de la pantalla al activase la VPN.
     </string>
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <string name="legacy_title">La VPN ta coneutada</string>
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+    <string name="legacy_title">La VPN ta coneutada</string>
+    <string name="configure">Configurar</string>
+    <string name="disconnect">Desconeutar</string>
+    <string name="session">Sesión:</string>
+    <string name="duration">Duración:</string>
+    <string name="data_transmitted">Unvióse:</string>
+    <string name="data_received">Recibióse:</string>
+    <string name="data_value_format">        <xliff:g id="number">%1$s</xliff:g> bytes /
+        <xliff:g id="number">%2$s</xliff:g> paquetes
+    </string>
 </resources>
diff --git a/packages/VpnDialogs/res/values-be/strings.xml b/packages/VpnDialogs/res/values-be/strings.xml
index 4903231c28b..8ed17ad05d3 100644
--- a/packages/VpnDialogs/res/values-be/strings.xml
+++ b/packages/VpnDialogs/res/values-be/strings.xml
@@ -15,32 +15,22 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
   <string name="prompt">Запыт на злучэнне</string>
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
   <string name="warning"><xliff:g id="app">%s</xliff:g>хоча ўсталяваць злучэнне VPN
         гэта дазваляе яму кантраляваць сеткавы трафік. Працягвайце, калі вы давяраеце крыніцы.
-        <![CDATA[
-        <br />
-        <br />
-        <img src="vpn_icon" />
-        ]]>адлюстроўваецца ў верхняй частцы экрана, калі VPN-актыўны.
+        
+        &lt;br /&gt;
+        &lt;br /&gt;
+        &lt;img src="vpn_icon" /&gt;
+        адлюстроўваецца ў верхняй частцы экрана, калі VPN-актыўны.
     </string>
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
   <string name="legacy_title">VPN падключаны</string>
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">Налады</string>
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
   <string name="disconnect">Адключыцца</string>
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
   <string name="session">Сэсія:</string>
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
   <string name="duration">Працягласць:</string>
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
   <string name="data_transmitted">Дасланыя:</string>
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
   <string name="data_received">Атрымана:</string>
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
   <string name="data_value_format">
         <xliff:g id="number">%1$s</xliff:g> байт /
         <xliff:g id="number">%2$s</xliff:g> пакетаў
diff --git a/packages/VpnDialogs/res/values-cy/strings.xml b/packages/VpnDialogs/res/values-cy/strings.xml
index 4afbe1f506e..90b61e7aa05 100644
--- a/packages/VpnDialogs/res/values-cy/strings.xml
+++ b/packages/VpnDialogs/res/values-cy/strings.xml
@@ -15,14 +15,20 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+    <string name="prompt">Cais am gysylltu</string>
+    <string name="warning">Mae <xliff:g id="app">%s</xliff:g> eisiau gosod cysylltiad VPN sy\'n ei alluogi i fonitro traffig rhwydwaith. Paid â derbyn oni bai dy fod yn ymddiried ynddo. Mae\'r eicon isod yn ymddangos ar frig y sgrin tra bod VPN ar waith.
+                &lt;br /&gt;
+        &lt;br /&gt;
+        &lt;img src="vpn_icon" /&gt;
+        ;    </string>
+    <string name="legacy_title">VPN wedi cysylltu</string>
+    <string name="configure">Ffurfweddu</string>
+    <string name="disconnect">Datgysylltu</string>
+    <string name="session">Sesiwn:</string>
+    <string name="duration">Hyd:</string>
+    <string name="data_transmitted">Anfonwyd:</string>
+    <string name="data_received">Derbyniwyd:</string>
+    <string name="data_value_format">        <xliff:g id="number">%1$s</xliff:g> beit /
+        <xliff:g id="number">%2$s</xliff:g> pecyn
+    </string>
 </resources>
diff --git a/packages/VpnDialogs/res/values-en-rPT/strings.xml b/packages/VpnDialogs/res/values-en-rPT/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-en-rPT/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-eo/strings.xml b/packages/VpnDialogs/res/values-eo/strings.xml
index 946765c354b..c7673f17644 100644
--- a/packages/VpnDialogs/res/values-eo/strings.xml
+++ b/packages/VpnDialogs/res/values-eo/strings.xml
@@ -15,15 +15,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <string name="disconnect">Malkonekti</string>
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+    <string name="disconnect">Malkonekti</string>
 </resources>
diff --git a/packages/VpnDialogs/res/values-es-rMX/strings.xml b/packages/VpnDialogs/res/values-es-rMX/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-fy-rNL/strings.xml b/packages/VpnDialogs/res/values-fy-rNL/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-fy-rNL/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-kab-rDZ/strings.xml b/packages/VpnDialogs/res/values-kab-rDZ/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-kab-rDZ/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-ku/strings.xml b/packages/VpnDialogs/res/values-ku/strings.xml
index 65b63807a77..9be1bc27b8d 100644
--- a/packages/VpnDialogs/res/values-ku/strings.xml
+++ b/packages/VpnDialogs/res/values-ku/strings.xml
@@ -15,25 +15,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <string name="legacy_title">VPN پەیوەستکراوە</string>
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <string name="configure">رێکخستن</string>
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <string name="disconnect">پچڕاندنی پەیوەندی</string>
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <string name="session">دانشتن:</string>
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <string name="duration">ماوه‌:</string>
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <string name="data_transmitted">گەیشت:</string>
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <string name="data_received">گەیشت:</string>
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-  <string name="data_value_format">
-        <xliff:g id="number">%1$s</xliff:g> بایت /
+    <string name="legacy_title">VPN پەیوەستکراوە</string>
+    <string name="configure">رێکخستن</string>
+    <string name="disconnect">پچڕاندنی پەیوەندی</string>
+    <string name="session">دانشتن:</string>
+    <string name="duration">ماوه‌:</string>
+    <string name="data_transmitted">گەیشت:</string>
+    <string name="data_received">گەیشت:</string>
+    <string name="data_value_format">        <xliff:g id="number">%1$s</xliff:g> بایت /
         <xliff:g id="number">%2$s</xliff:g> گیرفانەکان
     </string>
 </resources>
diff --git a/packages/VpnDialogs/res/values-lb/strings.xml b/packages/VpnDialogs/res/values-lb/strings.xml
index f598ac6b540..55fe150356f 100644
--- a/packages/VpnDialogs/res/values-lb/strings.xml
+++ b/packages/VpnDialogs/res/values-lb/strings.xml
@@ -15,33 +15,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <string name="prompt">Connectiounsufro</string>
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <string name="warning"><xliff:g id="app">%s</xliff:g> wëll eng VPN-Connectioun opstellen, wouduerch den Netzwierktrafic kann iwwerwaacht ginn. Acceptéier dat just, wann s du der Quell vertraus.
-        <![CDATA[
-        <br />
-        <br />
-        <img src="vpn_icon" />
-        ]]> erschéngt uewen um Schierm, wa VPN aktiv ass.
+    <string name="prompt">Connectiounsufro</string>
+    <string name="warning"><xliff:g id="app">%s</xliff:g> wëll eng VPN-Connectioun opstellen, wouduerch den Netzwierktrafic kann iwwerwaacht ginn. Acceptéier dat just, wann s du der Quell vertraus.
+                &lt;br /&gt;
+        &lt;br /&gt;
+        &lt;img src="vpn_icon" /&gt;
+         erschéngt uewen um Schierm, wa VPN aktiv ass.
     </string>
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <string name="legacy_title">VPN connectéiert</string>
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <string name="configure">Astellen</string>
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <string name="disconnect">Deconnectéieren</string>
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <string name="session">Sëtzung:</string>
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <string name="duration">Dauer:</string>
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <string name="data_transmitted">Geschéckt:</string>
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <string name="data_received">Empfaangen:</string>
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-  <string name="data_value_format">
-        <xliff:g id="number">%1$s</xliff:g> Bytes /
+    <string name="legacy_title">VPN connectéiert</string>
+    <string name="configure">Astellen</string>
+    <string name="disconnect">Deconnectéieren</string>
+    <string name="session">Sëtzung:</string>
+    <string name="duration">Dauer:</string>
+    <string name="data_transmitted">Geschéckt:</string>
+    <string name="data_received">Empfaangen:</string>
+    <string name="data_value_format">        <xliff:g id="number">%1$s</xliff:g> Bytes /
         <xliff:g id="number">%2$s</xliff:g> Päck
     </string>
 </resources>
diff --git a/packages/VpnDialogs/res/values-or-rIN/strings.xml b/packages/VpnDialogs/res/values-or-rIN/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-or-rIN/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-sc-rIT/strings.xml b/packages/VpnDialogs/res/values-sc-rIT/strings.xml
deleted file mode 100644
index 4afbe1f506e..00000000000
--- a/packages/VpnDialogs/res/values-sc-rIT/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-</resources>
diff --git a/packages/VpnDialogs/res/values-ug/strings.xml b/packages/VpnDialogs/res/values-ug/strings.xml
index f85983d77e5..beb1a2d9c75 100644
--- a/packages/VpnDialogs/res/values-ug/strings.xml
+++ b/packages/VpnDialogs/res/values-ug/strings.xml
@@ -15,25 +15,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
-  <string name="prompt">باغلىنىش ئىلتىماسى</string>
-  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
-  <string name="warning"><xliff:g id="app">%s</xliff:g> سىزنىڭ  VPN ئۇلىنىشىنى بېكىتىشىڭىزنى تەلەپ قىلىدۇ، تورنى نازارەت قىلدۇ. ئەگەر سىز ئىشەنسىڭىز يول قويۇڭ.
-<![CDATA[<br /><br /><img src="vpn_icon" />]]> ئېكراننىڭ چوققىسىدا كۆرۈنسە، VPN نىڭ ئاكتىپ ئىكەنلىكىنى بىلدۈرىدۇ.    </string>
-  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
-  <string name="legacy_title">VPN باغلاندى</string>
-  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
-  <string name="configure">سەپلىمە</string>
-  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
-  <string name="disconnect">ئۈز</string>
-  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
-  <string name="session">سۆزلىشىش</string>
-  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
-  <string name="duration">داۋاملىشىش ۋاقتى:</string>
-  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
-  <string name="data_transmitted">ئەۋەتىلگىنى:</string>
-  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
-  <string name="data_received">تاپشۇرۇۋالغىنى:</string>
-  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
-  <string name="data_value_format"><xliff:g id="NUMBER_0">%1$s</xliff:g> بايت/<xliff:g id="NUMBER_1">%2$s</xliff:g> بوغچا</string>
+    <string name="prompt">باغلىنىش ئىلتىماسى</string>
+    <string name="warning"><xliff:g id="app">%s</xliff:g> سىزنىڭ  VPN ئۇلىنىشىنى بېكىتىشىڭىزنى تەلەپ قىلىدۇ، تورنى نازارەت قىلدۇ. ئەگەر سىز ئىشەنسىڭىز يول قويۇڭ.&lt;br /&gt;&lt;br /&gt;&lt;img src="vpn_icon" /&gt; ئېكراننىڭ چوققىسىدا كۆرۈنسە، VPN نىڭ ئاكتىپ ئىكەنلىكىنى بىلدۈرىدۇ.    </string>
+    <string name="legacy_title">VPN باغلاندى</string>
+    <string name="configure">سەپلىمە</string>
+    <string name="disconnect">ئۈز</string>
+    <string name="session">سۆزلىشىش</string>
+    <string name="duration">داۋاملىشىش ۋاقتى:</string>
+    <string name="data_transmitted">ئەۋەتىلگىنى:</string>
+    <string name="data_received">تاپشۇرۇۋالغىنى:</string>
+    <string name="data_value_format"><xliff:g id="NUMBER_0">%1$s</xliff:g> بايت/<xliff:g id="NUMBER_1">%2$s</xliff:g> بوغچا</string>
 </resources>