From 03f1ab4f94c00fbe8035b176d2166c9c8517ec00 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Mon, 11 Mar 2019 00:22:04 +0100
Subject: [PATCH] Automatic translation import

Change-Id: Icf6a0b3829ad1e648f4dd18f50931b184a1e1535
---
 res/values-af/strings.xml        |  3 --
 res/values-am/strings.xml        | 23 -----------
 res/values-ar/strings.xml        |  3 --
 res/values-as/strings.xml        |  3 --
 res/values-ast-rES/strings.xml   |  3 --
 res/values-az/strings.xml        |  3 --
 res/values-b+sr+Latn/strings.xml | 23 -----------
 res/values-be/strings.xml        |  3 --
 res/values-bg/strings.xml        |  3 --
 res/values-bn/strings.xml        | 23 -----------
 res/values-br-rFR/strings.xml    | 23 -----------
 res/values-bs/strings.xml        | 23 -----------
 res/values-ca/strings.xml        |  3 --
 res/values-cs/strings.xml        |  5 +--
 res/values-csb/strings.xml       | 23 -----------
 res/values-cy/strings.xml        |  3 --
 res/values-da/strings.xml        |  3 --
 res/values-de/strings.xml        |  3 --
 res/values-el/strings.xml        |  3 --
 res/values-en-rAU/strings.xml    |  3 --
 res/values-en-rCA/strings.xml    | 67 ++++++++++++++++++++++++++++++--
 res/values-en-rGB/strings.xml    |  3 --
 res/values-en-rIN/strings.xml    |  3 --
 res/values-en-rPT/strings.xml    | 23 -----------
 res/values-eo/strings.xml        |  3 --
 res/values-es-rCO/strings.xml    | 23 -----------
 res/values-es-rMX/strings.xml    |  3 --
 res/values-es-rUS/strings.xml    |  3 --
 res/values-es/strings.xml        |  3 --
 res/values-et/strings.xml        |  3 --
 res/values-eu/strings.xml        |  3 --
 res/values-fa/strings.xml        |  3 --
 res/values-fi/strings.xml        |  3 --
 res/values-fil/strings.xml       | 23 -----------
 res/values-fr-rCA/strings.xml    | 23 -----------
 res/values-fr/strings.xml        |  3 --
 res/values-frp/strings.xml       | 23 -----------
 res/values-fy-rNL/strings.xml    |  3 --
 res/values-ga-rIE/strings.xml    | 23 -----------
 res/values-gd/strings.xml        |  3 --
 res/values-gl/strings.xml        |  3 --
 res/values-gu/strings.xml        |  3 --
 res/values-hi/strings.xml        |  3 --
 res/values-hr/strings.xml        |  3 --
 res/values-hu/strings.xml        |  3 --
 res/values-hy/strings.xml        | 23 -----------
 res/values-in/strings.xml        |  3 --
 res/values-is/strings.xml        | 23 -----------
 res/values-it/strings.xml        |  3 --
 res/values-iw/strings.xml        |  3 --
 res/values-ja/strings.xml        |  3 --
 res/values-ka/strings.xml        | 23 -----------
 res/values-kab-rDZ/strings.xml   | 23 -----------
 res/values-kk/strings.xml        | 23 -----------
 res/values-km/strings.xml        | 23 -----------
 res/values-kn/strings.xml        |  6 +--
 res/values-ko/strings.xml        |  3 --
 res/values-ku/strings.xml        |  3 --
 res/values-ky/strings.xml        | 23 -----------
 res/values-lb/strings.xml        |  3 --
 res/values-lo/strings.xml        | 23 -----------
 res/values-lt/strings.xml        |  3 --
 res/values-lv/strings.xml        |  3 --
 res/values-mk/strings.xml        | 23 -----------
 res/values-ml/strings.xml        |  3 --
 res/values-mn/strings.xml        | 23 -----------
 res/values-mr/strings.xml        |  3 --
 res/values-ms/strings.xml        | 23 -----------
 res/values-my/strings.xml        | 23 -----------
 res/values-nb/strings.xml        |  3 --
 res/values-ne/strings.xml        | 23 -----------
 res/values-nl/strings.xml        |  3 --
 res/values-oc/strings.xml        | 23 -----------
 res/values-or/strings.xml        |  3 --
 res/values-pa/strings.xml        | 23 -----------
 res/values-pl/strings.xml        |  3 --
 res/values-pt-rBR/strings.xml    |  3 --
 res/values-pt-rPT/strings.xml    |  3 --
 res/values-rm/strings.xml        | 23 -----------
 res/values-ro/strings.xml        |  3 --
 res/values-ru/strings.xml        |  3 --
 res/values-sc-rIT/strings.xml    |  3 --
 res/values-si/strings.xml        | 23 -----------
 res/values-sk/strings.xml        |  3 --
 res/values-sl/strings.xml        |  3 --
 res/values-sq/strings.xml        |  3 --
 res/values-sr/strings.xml        |  3 --
 res/values-sv/strings.xml        |  3 --
 res/values-sw/strings.xml        | 23 -----------
 res/values-ta/strings.xml        |  3 --
 res/values-te/strings.xml        |  3 --
 res/values-th/strings.xml        |  3 --
 res/values-tl/strings.xml        | 23 -----------
 res/values-tr/strings.xml        |  3 --
 res/values-ug/strings.xml        |  3 --
 res/values-uk/strings.xml        |  3 --
 res/values-ur/strings.xml        | 23 -----------
 res/values-uz/strings.xml        | 23 -----------
 res/values-vec/strings.xml       | 23 -----------
 res/values-vi/strings.xml        |  3 --
 res/values-zh-rCN/strings.xml    |  3 --
 res/values-zh-rHK/strings.xml    |  3 --
 res/values-zh-rTW/strings.xml    |  3 --
 res/values-zu/strings.xml        | 23 -----------
 104 files changed, 67 insertions(+), 1014 deletions(-)
 delete mode 100644 res/values-am/strings.xml
 delete mode 100644 res/values-b+sr+Latn/strings.xml
 delete mode 100644 res/values-bn/strings.xml
 delete mode 100644 res/values-br-rFR/strings.xml
 delete mode 100644 res/values-bs/strings.xml
 delete mode 100644 res/values-csb/strings.xml
 delete mode 100644 res/values-en-rPT/strings.xml
 delete mode 100644 res/values-es-rCO/strings.xml
 delete mode 100644 res/values-fil/strings.xml
 delete mode 100644 res/values-fr-rCA/strings.xml
 delete mode 100644 res/values-frp/strings.xml
 delete mode 100644 res/values-ga-rIE/strings.xml
 delete mode 100644 res/values-hy/strings.xml
 delete mode 100644 res/values-is/strings.xml
 delete mode 100644 res/values-ka/strings.xml
 delete mode 100644 res/values-kab-rDZ/strings.xml
 delete mode 100644 res/values-kk/strings.xml
 delete mode 100644 res/values-km/strings.xml
 delete mode 100644 res/values-ky/strings.xml
 delete mode 100644 res/values-lo/strings.xml
 delete mode 100644 res/values-mk/strings.xml
 delete mode 100644 res/values-mn/strings.xml
 delete mode 100644 res/values-ms/strings.xml
 delete mode 100644 res/values-my/strings.xml
 delete mode 100644 res/values-ne/strings.xml
 delete mode 100644 res/values-oc/strings.xml
 delete mode 100644 res/values-pa/strings.xml
 delete mode 100644 res/values-rm/strings.xml
 delete mode 100644 res/values-si/strings.xml
 delete mode 100644 res/values-sw/strings.xml
 delete mode 100644 res/values-tl/strings.xml
 delete mode 100644 res/values-ur/strings.xml
 delete mode 100644 res/values-uz/strings.xml
 delete mode 100644 res/values-vec/strings.xml
 delete mode 100644 res/values-zu/strings.xml

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c5157eab..abbb4650 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Opstel Ghoeroe</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Volgende</string>
     <string name="skip">Slaan oor</string>
     <string name="start">Begin</string>
@@ -67,7 +66,6 @@
     <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string>
     <string name="setup_require_cyanogen_label"><b>Jou rekening wagwoord sal vereis word</b> om jou toestel te gebruik, selfs na \'n fabriek herstel.</string>
     <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings &gt; Sekuriteit</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Kies nog \'n skerm sluit tipe</string>
     <string name="settings_fingerprint_setup_details">Hoe wil jy jou skerm sluit?</string>
     <string name="fingerprint_setup_title">Vingerafdruk opstelling</string>
@@ -76,7 +74,6 @@
     <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
     <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
     <string name="sim_locale_changed">%1$s SIM opgespoor</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Kies skerm sluit tipe</string>
     <string name="settings_lockscreen_setup_details">Hoe wil jy jou skerm sluit?</string>
     <string name="lockscreen_setup_title">Beskerm jou foon</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-am/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 635b0dc0..6ed69690 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">معالج الإعداد</string>
-    <!-- Partner SUW Strings -->
     <string name="next">التالي</string>
     <string name="skip">تخطي</string>
     <string name="start">البداية</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string>
     <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حسابك</b> حتى تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>
     <string name="setup_device_locked_instructions"><i>من أجل تشغيل/تعطيل هذه الميزة، الرجاء إذهب إلى إعدادات &gt; الأمان</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">حدد نوعاً احتياطياً لشاشة القفل</string>
     <string name="settings_fingerprint_setup_details">كيف تريد إقفال الشاشة؟</string>
     <string name="fingerprint_setup_title">إنشاء بصمة الإصبع</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
     <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
     <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">حدد نوع شاشة القفل</string>
     <string name="settings_lockscreen_setup_details">كيف تريد إقفال الشاشة؟</string>
     <string name="lockscreen_setup_title">حماية هاتفك</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 17be1544..1050d659 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">ছেটআপ ৱিজাৰ্ড</string>
-    <!-- Partner SUW Strings -->
     <string name="next">পৰৱৰ্তী</string>
     <string name="skip">বাদ দিয়া</string>
     <string name="start">আৰম্ভ</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">আনলক</string>
     <string name="setup_device_locked">ডিভাইচটো ব্যৱহাৰকৰ্তাৰ দ্বাৰা লক কৰা হৈছে।</string>
     <string name="setup_device_locked_instructions"><i>এই বৈশিষ্ট্যটো অন/অফ কৰিবলৈ অনুগ্ৰহ কৰি ছেটিংচ &gt; নিৰাপত্তা লৈ যাওক</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">স্ক্ৰীণৰ বেকআপ লকৰ প্ৰকাৰ চয়ন কৰক</string>
     <string name="settings_fingerprint_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
     <string name="fingerprint_setup_title">আঙুলিৰছাপ ছেটআপ</string>
@@ -69,6 +67,5 @@
     <string name="fingerprint_setup_add_fingerprint">আপোনাৰ আঙুলিৰছাপ যোগ কৰক</string>
     <string name="fingerprint_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
     <string name="sim_locale_changed">%1$s SIM চিনাক্ত কৰা হৈছে</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index bd6b91b3..89bb5102 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Encontu pa la configuración</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Siguiente</string>
     <string name="skip">Saltar</string>
     <string name="start">Entamar</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Esti preséu ta bloquiáu pol usuariu.</string>
     <string name="setup_require_cyanogen_label"><b>Riquir la contraseña de la to cuenta</b> pa usar el to preséu incluso dempués de reafitalu.</string>
     <string name="setup_device_locked_instructions"><i>Pa apagar/prender esta carauterística, por favor vete a Axustes &gt; Seguranza</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Esbilla\'l tipu de copia de seguranza de pantalla de bloquéu</string>
     <string name="settings_fingerprint_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
     <string name="fingerprint_setup_title">Configuración de buelga</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Amiesta la to buelga</string>
     <string name="fingerprint_setup_screen_lock_setup">Configuración del bloquéu de pantalla</string>
     <string name="sim_locale_changed">%1$s SIM deteutada</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Esbillar triba de pantalla de blouquéu</string>
     <string name="settings_lockscreen_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
     <string name="lockscreen_setup_title">Protexi\'l to teléfonu</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 6037c1f4..4c02e6df 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Quraşdırma Sehrbazı</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Sonrakı</string>
     <string name="skip">Ötür</string>
     <string name="start">Başla</string>
@@ -56,7 +55,6 @@
     <string name="setup_unlock">Kilidi aç</string>
     <string name="setup_device_locked">Bu cihaz istifadəçisi tərəfindən kilidlənib.</string>
     <string name="setup_device_locked_instructions"><i>Bu özəlliyi açıb bağlamaq üçün, zəhmət olmasa Tənzimləmələr &gt; Təhlükəsizlik bölməsinə gedin</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Ehtiyat ekran kilidi növünü seçin</string>
     <string name="settings_fingerprint_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
     <string name="fingerprint_setup_title">Barmaq izi quraşdırma</string>
@@ -64,6 +62,5 @@
     <string name="fingerprint_setup_backup_lock_method">İkinci kilid açma üsulunu quraşdırın</string>
     <string name="fingerprint_setup_add_fingerprint">Barmaq izinizi əlavə edin</string>
     <string name="fingerprint_setup_screen_lock_setup">Ekran kilidi qurun</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b87f77c4..9ccd5ecf 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Майстар налады</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Далей</string>
     <string name="skip">Прапусціць</string>
     <string name="start">Пачаць</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">Разблакаваць</string>
     <string name="setup_device_locked">Прылада была заблакавана карыстальнікам.</string>
     <string name="setup_device_locked_instructions"><i> Каб уключыць ці адключыць гэту функцыю, перайдзіце ў меню "Налады" &gt; "Бяспека"</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Выбраць рэзервовы спосаб блакавання экрана</string>
     <string name="settings_fingerprint_setup_details">Абярыце спосаб блакавання экрана.</string>
     <string name="fingerprint_setup_title">Налада адбіткаў пальцаў</string>
@@ -69,6 +67,5 @@
     <string name="fingerprint_setup_add_fingerprint">Дадаць адбітак пальца</string>
     <string name="fingerprint_setup_screen_lock_setup">Наладзіць блакаванне экрану</string>
     <string name="sim_locale_changed">%1$s SIM знойдзена</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">Абярыце спосаб блакавання экрана.</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2adbe1f8..ae12de21 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Съветник за инсталиране</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Следваща</string>
     <string name="skip">Пропусни</string>
     <string name="start">Старт</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Това устройство е заключено от потребителя.</string>
     <string name="setup_require_cyanogen_label"><b>Изисква паролата на акаунта</b> за да използвате устройството дори след фабрично нулиране.</string>
     <string name="setup_device_locked_instructions"><i>За да включите тази функция, изключено/включено, моля отидете на Настройки &gt; Сигурност</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Изберете резервен метод за заключване на екрана</string>
     <string name="settings_fingerprint_setup_details">Как бихте желали да заключите вашият екран?</string>
     <string name="fingerprint_setup_title">Създаване на пръстов отпечатък</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Добавете вашият пръстов отпечатък</string>
     <string name="fingerprint_setup_screen_lock_setup">Настройка на екрана за заключване</string>
     <string name="sim_locale_changed">Намерена %1$s СИМ карта</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Изберете метод на заключване на екрана</string>
     <string name="settings_lockscreen_setup_details">Как бихте желали да заключите вашият екран?</string>
     <string name="lockscreen_setup_title">Защитете телефона си</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-bn/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-br-rFR/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-bs/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index cd2c08d8..ecb653a8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistent de configuració</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Següent</string>
     <string name="skip">Omet</string>
     <string name="start">Inicia</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string>
     <string name="setup_require_cyanogen_label"><b>Demana la teva contrasenya del compte</b> per utilitzar el teu dispositiu, fins i tot després de restablir les configuracions de fàbrica.</string>
     <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració &gt; Seguretat</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Selecciona el tipus de bloqueig de pantalla de reserva</string>
     <string name="settings_fingerprint_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
     <string name="fingerprint_setup_title">Configuració de l\'empremta digital</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Afegeix la teva empremta digital</string>
     <string name="fingerprint_setup_screen_lock_setup">Configuració del bloqueig de pantalla</string>
     <string name="sim_locale_changed">%1$s SIM detectada</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Selecciona el tipus de bloqueig de pantalla</string>
     <string name="settings_lockscreen_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
     <string name="lockscreen_setup_title">Protegeix el teu telèfon</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f825f5c9..5251da7e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Průvodce instalací</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Další</string>
     <string name="skip">Přeskočit</string>
     <string name="start">Spustit</string>
@@ -64,12 +63,11 @@
     <string name="services_help_improve_cm">Pomozte vylepšit <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> automatickým odesíláním diagnostických dat a dat o používání do LineageOS. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových vlastností pro <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Použít navigační klávesy na obrazovce</b> namísto hw kláves.</string>
-    <string name="services_os_privacy_guard"><b>Povolit Ochranu soukromí</b> aby vaše osobní údaje například kontakty, zprávy nebo záznamy hovorů nebyli dostupné pro nově instalované aplikace</string>
+    <string name="services_os_privacy_guard"><b>Povolit Ochranu soukromí</b>, aby vaše osobní údaje (například kontakty, zprávy nebo záznamy hovorů) nebyly dostupné pro nově instalované aplikace</string>
     <string name="setup_unlock">Odemknout</string>
     <string name="setup_device_locked">Toto zařízení bylo uzamčeno uživatelem.</string>
     <string name="setup_require_cyanogen_label">Po obnovení továrního nastavení bude <b>vyžadováno heslo k Vašemu účtu</b>.</string>
     <string name="setup_device_locked_instructions"><i>Pro zapnutí/vypnutí této funkce, přejděte do nastavení &gt; Zabezpečení</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Vyberte záložní typ zámku obrazovky</string>
     <string name="settings_fingerprint_setup_details">Jak chcete zamykat obrazovku?</string>
     <string name="fingerprint_setup_title">Nastavení otisku prstu</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Přidat otisk prstu</string>
     <string name="fingerprint_setup_screen_lock_setup">Nastavit zámek obrazovky</string>
     <string name="sim_locale_changed">Zjištěna %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Vyberte typ zámku obrazovky</string>
     <string name="settings_lockscreen_setup_details">Jak chcete zamykat obrazovku?</string>
     <string name="lockscreen_setup_title">Chraňte svůj telefon</string>
diff --git a/res/values-csb/strings.xml b/res/values-csb/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-csb/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index ecce564b..858b9a48 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Dewin gosod</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Nesaf</string>
     <string name="skip">Neidio</string>
     <string name="start">Dechrau</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Mae\'r ddyfais hon wedi ei chloi gan y defnyddiwr.</string>
     <string name="setup_require_cyanogen_label"><b>Mynna bod angen cyfrinair dy gyfrif</b> er mwyn medru defnyddio\'r ddyfais, hyd yn oed os yw\'n cael ei ailosod i fel yr oedd yn gadael y ffatri.</string>
     <string name="setup_device_locked_instructions"><i>I droi\'r nodwedd hon ymlaen/i ffwrdd, edrycha yn Gosodiadau &gt; Diogelwch</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Dewis math o glo sgrin wrth gefn</string>
     <string name="settings_fingerprint_setup_details">Sut hoffet gloi dy sgrin?</string>
     <string name="fingerprint_setup_title">Gosod ôl bys</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Ychwanegu ôl dy fys</string>
     <string name="fingerprint_setup_screen_lock_setup">Gosod clo\'r sgrin</string>
     <string name="sim_locale_changed">Synhwyrwyd %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Dewis math o sgrin cloi</string>
     <string name="settings_lockscreen_setup_details">Sut hoffet gloi dy sgrin?</string>
     <string name="lockscreen_setup_title">Diogelu dy ffôn</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5b03d310..c5d0bdfc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installationsguide</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Næste</string>
     <string name="skip">Spring over</string>
     <string name="start">Start</string>
@@ -67,7 +66,6 @@
     <string name="setup_device_locked">Denne enhed er blevet låst af brugeren.</string>
     <string name="setup_require_cyanogen_label"><b>Kræver adgangskoden til din konto</b> for at bruge enheden, selv efter en nulstilling til fabriksindstillinger.</string>
     <string name="setup_device_locked_instructions"><i>For at slå denne funktion til/fra, skal du gå til Indstillinger &gt; Sikkerhed</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Vælg alternativ skærmlåstype</string>
     <string name="settings_fingerprint_setup_details">Hvordan vil du gerne låse din skærm?</string>
     <string name="fingerprint_setup_title">Konfigurerring af fingeraftryk</string>
@@ -76,7 +74,6 @@
     <string name="fingerprint_setup_add_fingerprint">Tilføje dit fingeraftryk</string>
     <string name="fingerprint_setup_screen_lock_setup">Konfigurere skærmlås</string>
     <string name="sim_locale_changed">%1$s SIM-kort fundet</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Vælg skærmlåstype</string>
     <string name="settings_lockscreen_setup_details">Hvordan vil du gerne låse din skærm?</string>
     <string name="lockscreen_setup_title">Beskyt din telefon</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 80336ab0..b0acb8e6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Einrichtungsassistent</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Weiter</string>
     <string name="skip">Überspringen</string>
     <string name="start">Start</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Dieses Gerät wurde vom Benutzer gesperrt.</string>
     <string name="setup_require_cyanogen_label"><b>Ihr Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string>
     <string name="setup_device_locked_instructions"><i>Um diese Funktion zu aktivieren/deaktivieren, gehen Sie zu Einstellungen &gt; Sicherheit.</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Wählen Sie den Typ der Ersatz-Bildschirmsperre.</string>
     <string name="settings_fingerprint_setup_details">Wie möchten Sie Ihren Bildschirm sperren?</string>
     <string name="fingerprint_setup_title">Fingerabdruck einrichten</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Fügen Sie Ihren Fingerabdruck hinzu.</string>
     <string name="fingerprint_setup_screen_lock_setup">Die Bildschirmsperre einrichten</string>
     <string name="sim_locale_changed">%1$s SIM-Karte erkannt</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Wählen Sie einen Sperrbildschirm-Typ</string>
     <string name="settings_lockscreen_setup_details">Wie möchten Sie Ihren Bildschirm sperren?</string>
     <string name="lockscreen_setup_title">Schützen Sie Ihr Telefon</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 95291c4f..839e6bea 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Οδηγός εγκατάστασης</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Επόμενο</string>
     <string name="skip">Παράλειψη</string>
     <string name="start">Έναρξη</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Αυτή η συσκευή έχει κλειδωθεί από το χρήστη.</string>
     <string name="setup_require_cyanogen_label"><b>Απαίτηση του κωδικού πρόσβασης του λογαριασμού σας</b> για να χρησιμοποιήσετε τη συσκευή σας, ακόμα και μετά από επαναφορά εργοστασιακών ρυθμίσεων.</string>
     <string name="setup_device_locked_instructions"><i>Για να ενεργοποιήσετε/απενεργοποιήσετε αυτή τη λειτουργία, παρακαλώ πηγαίνετε στις Ρυθμίσεις &gt; Ασφάλεια</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Επιλέξτε δευτερεύον κλείδωμα οθόνης</string>
     <string name="settings_fingerprint_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
     <string name="fingerprint_setup_title">Ρύθμιση δακτυλικού αποτυπώματος</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Προσθέστε το δακτυλικό σας αποτύπωμα</string>
     <string name="fingerprint_setup_screen_lock_setup">Ρύθμιση κλειδώματος οθόνης</string>
     <string name="sim_locale_changed">Ανιχνεύθηκε %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Επιλέξτε κλείδωμα οθόνης</string>
     <string name="settings_lockscreen_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
     <string name="lockscreen_setup_title">Προστατέψτε το τηλέφωνό σας</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index da1721f2..b71de097 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Setup Wizard</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Next</string>
     <string name="skip">Skip</string>
     <string name="start">Start</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">This device has been locked by the user.</string>
     <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
     <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
     <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
     <string name="fingerprint_setup_title">Fingerprint setup</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
     <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
     <string name="sim_locale_changed">%1$s SIM detected</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Select screen lock type</string>
     <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
     <string name="lockscreen_setup_title">Protect your phone</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 0c759fb5..b970bd2f 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -17,7 +17,68 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
+    <string name="app_name">Setup Wizard</string>
+    <string name="next">Next</string>
+    <string name="skip">Skip</string>
+    <string name="start">Start</string>
+    <string name="done">Done</string>
+    <string name="ok">OK</string>
+    <string name="loading">Just a sec\u2026</string>
+    <string name="setup_complete">Setup is complete</string>
+    <string name="setup_welcome">Welcome</string>
+    <string name="setup_locale">Language</string>
+    <string name="setup_wifi">Select Wi-Fi</string>
+    <string name="setup_sim_missing">SIM card missing</string>
+    <string name="setup_choose_data_sim">Choose a SIM for data</string>
+    <string name="setup_location">Location services</string>
+    <string name="setup_other">Other services</string>
+    <string name="setup_datetime">Date &amp; time</string>
+    <string name="setup_current_date">Current date</string>
+    <string name="setup_current_time">Current time</string>
+    <string name="sim_missing_summary" product="tablet">A SIM card has not been detected in your tablet. To insert a SIM card, read the instructions that came with your device.</string>
+    <string name="sim_missing_summary" product="default">A SIM card has not been detected in your phone. To insert a SIM card, read the instructions that came with your device.</string>
+    <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
+    <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
+    <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
+    <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
+    <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
+    <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
+    <string name="location_battery_saving"><b>Reduce battery consumption</b> by restricting the number of GPS updates per hour.</string>
+    <string name="location_network"><b>Use Wi-Fi</b> to help apps determine your location.</string>
+    <string name="location_network_telephony"><b>Use Wi-Fi and cellular networks</b> to help apps determine your location.</string>
+    <string name="location_network_gms"><b>Use Google\'s location service</b> to help apps determine your location. This means sending anonymous location data to Google, even when no apps are running.</string>
+    <string name="setup_mobile_data">Turn on cellular data</string>
+    <string name="setup_mobile_data_no_service">No service</string>
+    <string name="setup_mobile_data_emergency_only">Emergency calls only</string>
+    <string name="enable_mobile_data_summary">Do you want to use cellular data during setup? Turning on cellular data may be subject to data charges.</string>
+    <string name="no">No</string>
+    <string name="yes">Yes</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+    <string name="emergency_call">Emergency call</string>
+    <string name="setup_services">LineageOS features</string>
+    <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="services_privacy_policy">Privacy Policy</string>
+    <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
+    <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
+    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</string>
+    <string name="setup_unlock">Unlock</string>
+    <string name="setup_device_locked">This device has been locked by the user.</string>
+    <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
+    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
+    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
+    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <string name="fingerprint_setup_title">Fingerprint setup</string>
+    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
+    <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
+    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
+    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+    <string name="sim_locale_changed">%1$s SIM detected</string>
+    <string name="settings_lockscreen_setup_title">Select screen lock type</string>
+    <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
+    <string name="lockscreen_setup_title">Protect your phone</string>
+    <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
+    <string name="lockscreen_setup_screen_lock_setup">Set up</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 09eb6537..926c5ba5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Setup Wizard</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Next</string>
     <string name="skip">Skip</string>
     <string name="start">Start</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">This device has been locked by the user.</string>
     <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
     <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
     <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
     <string name="fingerprint_setup_title">Fingerprint setup</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
     <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
     <string name="sim_locale_changed">%1$s SIM detected</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Select screen lock type</string>
     <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
     <string name="lockscreen_setup_title">Protect your phone</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0693946c..b970bd2f 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Setup Wizard</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Next</string>
     <string name="skip">Skip</string>
     <string name="start">Start</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">This device has been locked by the user.</string>
     <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
     <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
     <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
     <string name="fingerprint_setup_title">Fingerprint setup</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
     <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
     <string name="sim_locale_changed">%1$s SIM detected</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Select screen lock type</string>
     <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
     <string name="lockscreen_setup_title">Protect your phone</string>
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-en-rPT/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index a2bc4945..5c5c7e75 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -17,8 +17,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
     <string name="yes">Jes</string>
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
 </resources>
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-es-rCO/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index 6cb01d09..b763803f 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -17,12 +17,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
     <string name="location_battery_saving"><b>Reduce el consumo de batería</b> restringiendo el número de actualizaciones del GPS por hora.</string>
     <string name="location_network_telephony"><b>Utiliza el Wi-Fi y las redes móviles</b> para ayudar a las aplicaciones a determinar tu ubicación.</string>
     <string name="setup_mobile_data">Activar datos móviles</string>
     <string name="enable_mobile_data_summary">¿Deseas utilizar datos móviles durante la instalación? Activar los datos móviles puede provocar cargos de datos.</string>
-    <!-- Fingerprint setup -->
     <string name="sim_locale_changed">%1$s SIM detectada</string>
-    <!-- secure lock screen -->
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cca37490..7ffcb188 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Asistente de configuración</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Siguiente</string>
     <string name="skip">Omitir</string>
     <string name="start">Inicio</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string>
     <string name="setup_require_cyanogen_label"><b>Se necesita la contraseña de la cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string>
     <string name="setup_device_locked_instructions"><i>Para activar y desactivar esta característica, ve a «Ajustes &gt; Seguridad»</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Selecciona el tipo de copia de seguridad de pantalla bloqueada</string>
     <string name="settings_fingerprint_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
     <string name="fingerprint_setup_title">Ajustes de huella digital</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Añadir tu huella digital</string>
     <string name="fingerprint_setup_screen_lock_setup">Configurar la pantalla bloqueada</string>
     <string name="sim_locale_changed">%1$s SIM detectada</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Seleccione el tipo de bloqueo de pantalla</string>
     <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
     <string name="lockscreen_setup_title">Protege el teléfono</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 20f7962f..e5b79e33 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Asistente de configuración</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Siguiente</string>
     <string name="skip">Omitir</string>
     <string name="start">Iniciar</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string>
     <string name="setup_require_cyanogen_label"><b>Requieren la contraseña de tu cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento.</string>
     <string name="setup_device_locked_instructions"><i>Para activar o desactivar esta función, ve a Ajustes &gt; Seguridad</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Selecciona el tipo de copia de seguridad de pantalla de bloqueo</string>
     <string name="settings_fingerprint_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
     <string name="fingerprint_setup_title">Ajustes de huella digital</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Añade tu huella digital</string>
     <string name="fingerprint_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
     <string name="sim_locale_changed">%1$s SIM detectada</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Seleccione el tipo de bloqueo de la pantalla</string>
     <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
     <string name="lockscreen_setup_title">Proteja su teléfono</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2c5a895b..899b0bc9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Häälestusviisard</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Järgmine</string>
     <string name="skip">Jäta vahele</string>
     <string name="start">Alusta</string>
@@ -58,7 +57,6 @@
     <string name="setup_unlock">Ava lukustus</string>
     <string name="setup_device_locked">Seade on kasutaja poolt lukustatud.</string>
     <string name="setup_device_locked_instructions"><i>Funktsiooni sisse/välja lülitamiseks mine Seaded &gt; Turvalisus</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Valige alternatiivne ekraani luku tüüp</string>
     <string name="settings_fingerprint_setup_details">Kuidas soovite ekraani lukustada?</string>
     <string name="fingerprint_setup_title">Sõrmejälgede seadistamine</string>
@@ -66,6 +64,5 @@
     <string name="fingerprint_setup_backup_lock_method">Häälesta teisejärguline avamise meetod</string>
     <string name="fingerprint_setup_add_fingerprint">Lisa oma sõrmejälg</string>
     <string name="fingerprint_setup_screen_lock_setup">Ekraaniluku seadistamine</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">Kuidas soovite ekraani lukustada?</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0f4be1b4..d786998e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Ezarpen laguntzailea</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Hurrengoa</string>
     <string name="skip">Saltatu</string>
     <string name="start">Hasi</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Erabiltzaileak gailu hau blokeatu du.</string>
     <string name="setup_require_cyanogen_label"><b>Eskatu zure kontuaren pasahitza</b> gailua erabiltzeko lantegiko jatorrizko ezarpenetara berrezarri eta gero ere.</string>
     <string name="setup_device_locked_instructions"><i>Ezaugarri hau gaitu edo ezgaitzeko zoaz hona: Ezarpenak &gt; Segurtasuna</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Aukeratu ordezko pantaila blokeo mota</string>
     <string name="settings_fingerprint_setup_details">Nola blokeatu nahi duzu pantaila?</string>
     <string name="fingerprint_setup_title">Hatz-markaren ezarpena</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Gehitu zure hatz-marka</string>
     <string name="fingerprint_setup_screen_lock_setup">Ezarri pantaila blokeoa</string>
     <string name="sim_locale_changed">%1$s SIM antzeman da</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Hautatu pantaila-blokeo mota</string>
     <string name="settings_lockscreen_setup_details">Nola blokeatu nahi duzu pantaila?</string>
     <string name="lockscreen_setup_title">Babestu telefonoa</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 49b6bdb9..bc6d3e39 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">راهنمای راه‌اندازی</string>
-    <!-- Partner SUW Strings -->
     <string name="next">مرحله بعد</string>
     <string name="skip">رد شدن</string>
     <string name="start">شروع</string>
@@ -56,7 +55,6 @@
     <string name="setup_unlock">باز کردن</string>
     <string name="setup_device_locked">این دستگاه توسط کاربر قفل شده است.</string>
     <string name="setup_device_locked_instructions"><i>برای خاموش/روشن کردن این ویژگی، لطفا به تنظیمات &gt; امنیت بروید</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">انتخاب قفل پشتیبان صفحه</string>
     <string name="settings_fingerprint_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
     <string name="fingerprint_setup_title">تنظیمات اثر انگشت</string>
@@ -64,6 +62,5 @@
     <string name="fingerprint_setup_backup_lock_method">تنظیم روش دوم باز کردن قفل</string>
     <string name="fingerprint_setup_add_fingerprint">افزودن اثر انگشت خود</string>
     <string name="fingerprint_setup_screen_lock_setup">تنظیمات قفل صفحه</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index befce7f8..f039129b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Ohjattu asennus</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Seuraava</string>
     <string name="skip">Ohita</string>
     <string name="start">Aloita</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Käyttäjä on lukinnut laitteen.</string>
     <string name="setup_require_cyanogen_label"><b>Vaadi tilin salasana</b> käyttääksesi laitetta myös tehdasasetusten palautuksen jälkeen.</string>
     <string name="setup_device_locked_instructions"><i>Poistaaksesi tämän ominaisuuden käytöstä/ottaaksesi käyttöön, mene Asetukset &gt; Suojaus</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Valitse toinen näytön lukitustapa</string>
     <string name="settings_fingerprint_setup_details">Miten haluat lukita näyttösi?</string>
     <string name="fingerprint_setup_title">Sormenjäljen asetus</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Lisää sormenjälkesi</string>
     <string name="fingerprint_setup_screen_lock_setup">Aseta näytön lukitus</string>
     <string name="sim_locale_changed">%1$s SIM tunnistettu</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Valitse näytön lukitustapa</string>
     <string name="settings_lockscreen_setup_details">Miten haluat lukita näyttösi?</string>
     <string name="lockscreen_setup_title">Suojaa puhelintasi</string>
diff --git a/res/values-fil/strings.xml b/res/values-fil/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-fil/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6879b6a2..ccdf5382 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistant de configuration</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Suivant</string>
     <string name="skip">Ignorer</string>
     <string name="start">Commencer</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Cet appareil a été verrouillé par l\'utilisateur.</string>
     <string name="setup_require_cyanogen_label"><b>Nécessite le mot de passe de votre compte</b> afin d\'utiliser votre appareil même après une réinitialisation d\'usine.</string>
     <string name="setup_device_locked_instructions"><i>Pour activer/désactiver cette fonction, veuillez vous rendre dans Paramètres &gt; Sécurité</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Sélection du type de verrouillage d\'écran de sauvegarde</string>
     <string name="settings_fingerprint_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
     <string name="fingerprint_setup_title">Enregistrement d\'empreintes digitales</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Ajouter votre empreinte digitale</string>
     <string name="fingerprint_setup_screen_lock_setup">Configurer le verrouillage de l\'écran</string>
     <string name="sim_locale_changed">%1$s carte SIM détectée</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Sélectionner le type de verrouillage de l\'écran</string>
     <string name="settings_lockscreen_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
     <string name="lockscreen_setup_title">Protéger votre téléphone</string>
diff --git a/res/values-frp/strings.xml b/res/values-frp/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-frp/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index 5a24a078..2ae32609 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -17,8 +17,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
     <string name="ok">OK</string>
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
 </resources>
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-ga-rIE/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-gd/strings.xml b/res/values-gd/strings.xml
index 4849e101..d9bd71db 100644
--- a/res/values-gd/strings.xml
+++ b/res/values-gd/strings.xml
@@ -17,13 +17,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
     <string name="done">Deiseil</string>
     <string name="no">Chan eil</string>
     <string name="yes">Tha</string>
     <string name="services_help_improve_cm">Cuidich gus piseach a thoirt air <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Cuidich gus piseach a thoirt air LineageOS">%1$s</xliff:g> is tu a’ cur dàta na diagnosachd ’s a’ chleachdaidh gu LineageOS gu fèin-obrachail. Cha ghabh an dàta sin a chleachdadh airson d’ aithneachadh agus bheir e cuideachadh dha na sgiobaidhean a bhios ag obair air rudan mar beatha a’ bhataraidh, dèanadas nan aplacaidean agus gleusan <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ùra.</string>
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
     <string name="lockscreen_setup_summary"><b>Dìon an t-uidheam seo</b> agus iarr PIN, pàtran no facal-faire gus a’ ghlas a thoirt far na sgrìn</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index e32349ee..9f8f7df6 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Asistente de configuración</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Seguinte</string>
     <string name="skip">Omitir</string>
     <string name="start">Comezar</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Este dispositivo foi bloqueado polo usuario.</string>
     <string name="setup_require_cyanogen_label"><b>Precísase o seu contrasinal</b> para poder utilizar o seu dispositivo mesmo tras unha restauración de fábrica.</string>
     <string name="setup_device_locked_instructions"><i>Para acender ou apagar esta funcionalidade, vaia a Configuración &gt; Seguranza</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Seleccione o tipo de copia de seguranza de pantalla de bloqueo</string>
     <string name="settings_fingerprint_setup_details">Como quere bloquear a súa pantalla?</string>
     <string name="fingerprint_setup_title">Configuración da pegada dactilar</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Engadir a súa pegada dactilar</string>
     <string name="fingerprint_setup_screen_lock_setup">Configurar o bloqueo da pantalla</string>
     <string name="sim_locale_changed">%1$s SIM detectado</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Seleccionar o tipo de bloqueo da pantalla</string>
     <string name="settings_lockscreen_setup_details">Como quere bloquear a súa pantalla?</string>
     <string name="lockscreen_setup_title">Protexe o teu móbil</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1c7401a5..eae59dbf 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">સેટઅપ વિઝાર્ડ</string>
-    <!-- Partner SUW Strings -->
     <string name="next">આગલું</string>
     <string name="skip">છોડી દો</string>
     <string name="start">પ્રારંભ કરો</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">અનલૉક કરો</string>
     <string name="setup_device_locked">આ ડિવાઇસ ઉપયોગકર્તા દ્વારા લૉક કરવામાં આવી છે.</string>
     <string name="setup_device_locked_instructions"><i>આ ફીચર ઑફ/ઑન કરવા, કૃપા કરીને સેટિંગ્સ &gt; સિક્યોરિટી પર જાવ</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">બૅકઅપ સ્ક્રીન લૉક ટાઇપ પસંદ કરો</string>
     <string name="settings_fingerprint_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
     <string name="fingerprint_setup_title">ફિંગરપ્રિન્ટ સેટઅપ</string>
@@ -69,7 +67,6 @@
     <string name="fingerprint_setup_add_fingerprint">તમારી ફિંગરપ્રિન્ટ ઉમેરો</string>
     <string name="fingerprint_setup_screen_lock_setup">સ્ક્રીન લૉક સેટઅપ કરો</string>
     <string name="sim_locale_changed">%1$s SIM સૂચિત</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
     <string name="lockscreen_setup_title">તમારા ફોનને સુરક્ષિત કરો</string>
     <string name="lockscreen_setup_summary"><b>આ ઉપકરણને સુરક્ષિત કરો</b> અને સ્ક્રીનને અનલૉક કરવા માટે PIN, પેટર્ન અથવા પાસવર્ડ જરૂરી</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ab1b388e..858bc700 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">सेटअप विज़ार्ड</string>
-    <!-- Partner SUW Strings -->
     <string name="next">अगला</string>
     <string name="skip">छोड़ें</string>
     <string name="start">शुरू करें</string>
@@ -56,7 +55,6 @@
     <string name="setup_unlock">अनलॉक करें</string>
     <string name="setup_device_locked">इस उपकरण को उपयोगकर्ता ने लॉक किया है।</string>
     <string name="setup_device_locked_instructions"><i>इस सुविधा को बंद/चालू करने के लिए, कृपया सेटिंग &gt;सुरक्षा में जाएँ</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">बैकअप स्क्रीन लॉक प्रकार चुनें</string>
     <string name="settings_fingerprint_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
     <string name="fingerprint_setup_title">अँगुली छाप सेटअप</string>
@@ -64,6 +62,5 @@
     <string name="fingerprint_setup_backup_lock_method">अनलॉक करने की कोई दूसरी विधि भी सेट अप करें</string>
     <string name="fingerprint_setup_add_fingerprint">अपनी अँगुली छाप जोड़ें</string>
     <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करें</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 55f67a57..f5243255 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Čarobnjak za postavljanje</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Dalje</string>
     <string name="skip">Preskoči</string>
     <string name="start">Započni</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Uređaj je zaključao korisnik.</string>
     <string name="setup_require_cyanogen_label"><b>Zahtijeva lozinku vašeg računa</b>za korištenje vašim uređajem čak i nakon vraćanja na tvorničke postavke.</string>
     <string name="setup_device_locked_instructions"><i>Da bi isključili/uključili ovo, idite u Postavke &gt; Privatnost</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Izaberite rezerni tip zaključavanja zaslona</string>
     <string name="settings_fingerprint_setup_details">Kako želite zaključati vaš zaslon?</string>
     <string name="fingerprint_setup_title">Postavljanje otiska prsta</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Dodajte svoj ​​otisak</string>
     <string name="fingerprint_setup_screen_lock_setup">Postavljanje zaključavanja zaslona</string>
     <string name="sim_locale_changed">%1$s SIM otkriven</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Odaberite vrstu zaključavanja zaslona</string>
     <string name="settings_lockscreen_setup_details">Kako želite zaključati vaš zaslon?</string>
     <string name="lockscreen_setup_title">Zaštitite svoj telefon</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 426ef0c3..0e4fffef 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Telepítő varázsló</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Következő</string>
     <string name="skip">Kihagyás</string>
     <string name="start">Indít</string>
@@ -67,7 +66,6 @@
     <string name="setup_device_locked">Ezt az eszközt a felhasználó zárolta.</string>
     <string name="setup_require_cyanogen_label"><b>Fiókjának jelszava szükséges</b> a készülék használatához, még a gyári beállítások visszaállítása után is.</string>
     <string name="setup_device_locked_instructions"><i>A szolgáltatás ki/be kapcsolásához, kérjük menjen ide: Beállítások &gt; Biztonság</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Válasszon másodlagos feloldási módot</string>
     <string name="settings_fingerprint_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
     <string name="fingerprint_setup_title">Ujjlenyomat beállítások</string>
@@ -76,7 +74,6 @@
     <string name="fingerprint_setup_add_fingerprint">Adja hozzá ujjlenyomatát</string>
     <string name="fingerprint_setup_screen_lock_setup">Képernyőzár beállítása</string>
     <string name="sim_locale_changed">%1$s SIM észlelve</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Válasszon képernyő zárolási típust</string>
     <string name="settings_lockscreen_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
     <string name="lockscreen_setup_title">Óvja meg telefonját</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-hy/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index be71aa12..e634c64d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Panduan Penyiapan</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Berikutnya</string>
     <string name="skip">Lewati</string>
     <string name="start">Mulai</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Perangkat ini telah dikunci oleh pengguna.</string>
     <string name="setup_require_cyanogen_label"><b>Memerlukan kata sandi akun anda</b> untuk dapat menggunakan perangkat meskipun setelah di setel ulang ke pengaturan pabrik.</string>
     <string name="setup_device_locked_instructions"><i>Untuk mengaktifkan/menonaktifkan fitur ini, silakan masuk ke Pengaturan &gt; Keamanan</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Pilih tipe kunci layar cadangan</string>
     <string name="settings_fingerprint_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
     <string name="fingerprint_setup_title">Penyiapan sidik jari</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Tambahkan sidik jari Anda</string>
     <string name="fingerprint_setup_screen_lock_setup">Siapkan kunci layar</string>
     <string name="sim_locale_changed">%1$s SIM terdeteksi</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Pilih tipe kunci layar</string>
     <string name="settings_lockscreen_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
     <string name="lockscreen_setup_title">Lindungi telepon anda</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-is/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0c0a979f..18252df7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installazione guidata</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Avanti</string>
     <string name="skip">Salta</string>
     <string name="start">Inizia</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Questo dispositivo è stato bloccato dall\'utente.</string>
     <string name="setup_require_cyanogen_label"><b>È necessaria la password del tuo account</b> al fine di utilizzare il dispositivo anche dopo il ripristino di fabbrica.</string>
     <string name="setup_device_locked_instructions"><i>Per attivare e disattivare questa funzione, vai in Impostazioni &gt; Sicurezza</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Seleziona la schermata di sicurezza di riserva</string>
     <string name="settings_fingerprint_setup_details">Come vuoi bloccare lo schermo?</string>
     <string name="fingerprint_setup_title">Setup impronte digitali</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Aggiungere un\'impronta</string>
     <string name="fingerprint_setup_screen_lock_setup">Imposta un blocco schermo</string>
     <string name="sim_locale_changed">%1$s SIM rilevata</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Seleziona il tipo di blocco schermo</string>
     <string name="settings_lockscreen_setup_details">Come vuoi bloccare lo schermo?</string>
     <string name="lockscreen_setup_title">Proteggi il tuo telefono</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5d652fab..1b2be383 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">אשף ההגדרות</string>
-    <!-- Partner SUW Strings -->
     <string name="next">הבא</string>
     <string name="skip">דלג</string>
     <string name="start">התחל</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">מכשיר זה ננעל על-ידי המשתמש.</string>
     <string name="setup_require_cyanogen_label"><b>דרוש את סיסמת החשבון שלך</b> כדי להשתמש במכשיר אפילו לאחר איפוס מלא.</string>
     <string name="setup_device_locked_instructions"><i>כדי להפעיל/לכבות אפשרות זו, גש להגדרות &gt; אבטחה</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">בחר סוג שיטת נעילת מסך לגיבוי</string>
     <string name="settings_fingerprint_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
     <string name="fingerprint_setup_title">הגדרת טביעת אצבע</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">הוסף את טביעת האצבע שלך</string>
     <string name="fingerprint_setup_screen_lock_setup">הגדרת מסך נעילה</string>
     <string name="sim_locale_changed">זוהו %1$s כרטיסי SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">בחר סוג נעילת מסך</string>
     <string name="settings_lockscreen_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
     <string name="lockscreen_setup_title">הגן על הטלפון שלך</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index da9091c3..18dde773 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">セットアップウィザード</string>
-    <!-- Partner SUW Strings -->
     <string name="next">次へ</string>
     <string name="skip">スキップ</string>
     <string name="start">開始</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">この端末はユーザーによってロックされています。</string>
     <string name="setup_require_cyanogen_label">工場出荷時の状態にリセットした後でも、この端末を使用するには<b>アカウントのパスワードの入力が必要です</b>。</string>
     <string name="setup_device_locked_instructions"><i>この機能をOFF/ONするには、設定→プライバシーを開いてください</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">予備の画面のロックの種類を選択</string>
     <string name="settings_fingerprint_setup_details">どのように画面をロックしますか？</string>
     <string name="fingerprint_setup_title">指紋のセットアップ</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">指紋を追加</string>
     <string name="fingerprint_setup_screen_lock_setup">画面のロックをセットアップ</string>
     <string name="sim_locale_changed">%1$sのSIMを検出しました</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">画面のロックの種類を選択</string>
     <string name="settings_lockscreen_setup_details">どのように画面をロックしますか？</string>
     <string name="lockscreen_setup_title">スマートフォンの保護</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-ka/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-kab-rDZ/strings.xml b/res/values-kab-rDZ/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-kab-rDZ/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-kk/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-km/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b5357576..4ff1e62f 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">ಸೆಟಪ್ ವಿಝಾರ್ಡ್</string>
-    <!-- Partner SUW Strings -->
     <string name="next">ಮುಂದೆ</string>
     <string name="skip">ಸ್ಕಿಪ್</string>
     <string name="start">ಪ್ರಾರಂಭಿಸಿ</string>
@@ -56,11 +55,12 @@
     <string name="data_sim_name">ಸಿಮ್ <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
     <string name="emergency_call">ತುರುಪರೀಸ್ಥಿತಿ ಕರೆ</string>
     <string name="services_privacy_policy">ಗೌಪ್ಯತಾ ನೀತಿ</string>
+    <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g> ಸುಧಾರಿಸಲು ನೆರವಾಗು</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> ವಿಶ್ಲೇಷಣಾತ್ಮಕ ಮತ್ತು ಬಳಕೆಯ ದತ್ತಾಂಶವನ್ನು ಸ್ವಯಂ LineageOSಗೆ ಕಳುಹಿಸುವ ಮೂಲಕ. ಈ ಮಾಹಿತಿಯಿಂದ ನಿಮ್ಮನ್ನು ಗುರುತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಆದರೆ ಬ್ಯಾಟರಿ, ಅಪ್ಲಿಕೇಶನ್ ಕ್ಷಮತೆ ಮತ್ತು ಹೊಸ <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ವೈಶಿಷ್ಟ್ಯಗಳ ಬಗ್ಗೆ ಕೆಲಸ ಮಾಡುವ ತಂಡಗಳಿಗೆ ನೆರವಾಗುತ್ತದೆ.</string>
     <string name="services_os_nav_keys_label">ಹಾರ್ಡ್‍ವೇರ್ ಕೀಗಳ ಬದಲಾಗಿ <b>ಪರದೆಯ ಮೇಲಿನ ನಾವಿಗೇಶನ್ ಕೀಗಳನ್ನು ಉಪಯೋಗಿಸಿ</b>.</string>
     <string name="setup_unlock">ಅನ್‍ಲಾಕ್</string>
     <string name="setup_device_locked">ಸಾಧನವನ್ನು ಬಳಕೆದಾರನು ಲಾಕ್ ಮಾಡಿದ್ದಾರೆ.</string>
     <string name="setup_device_locked_instructions"><i>ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆಫ್/ಆನ್ ಮಾಡಲು. ದಯವಿಟ್ಟು ಸೆಟ್ಟಿಂಗ್ಸ್ &gt;: ಭದ್ರತೆಗೆ ಹೋಗಿ</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">ಬ್ಯಾಕಪ್ ಪರದೆ ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
     <string name="settings_fingerprint_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
     <string name="fingerprint_setup_title">ಫಿಂಗರ್‍ಪ್ರಿಂಟ್ ಸೆಟಪ್</string>
@@ -68,8 +68,6 @@
     <string name="fingerprint_setup_backup_lock_method">ಒಂದು ದ್ವಿತೀಯಕ ಅನ್‍ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಸೆಟಪ್ ಮಾಡಿ</string>
     <string name="fingerprint_setup_add_fingerprint">ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟನ್ನು ಸೇರಿಸಿ</string>
     <string name="fingerprint_setup_screen_lock_setup">ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ</string>
-    <string name="sim_locale_changed">%1$s SIM ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
     <string name="lockscreen_setup_title">ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ</string>
     <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸಿ</b>. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c3341828..45d81094 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">설치 마법사</string>
-    <!-- Partner SUW Strings -->
     <string name="next">다음</string>
     <string name="skip">건너뛰기</string>
     <string name="start">시작</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">이 기기는 사용자에 의해 잠겨 있습니다.</string>
     <string name="setup_require_cyanogen_label">공장 초기화 후에도 기기를 사용하려면 <b>계정 비밀번호가 필요합니다</b>.</string>
     <string name="setup_device_locked_instructions"><i>이 기능을 켜거나 끄려면, 설정 &gt; 보안으로 이동하세요</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">백업 화면 잠금 방법 선택</string>
     <string name="settings_fingerprint_setup_details">화면을 어떻게 잠그시겠습니까?</string>
     <string name="fingerprint_setup_title">지문 설정</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">지문 추가</string>
     <string name="fingerprint_setup_screen_lock_setup">화면 잠금 설정</string>
     <string name="sim_locale_changed">%1$s SIM 인식됨</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">화면 잠금 방식 선택</string>
     <string name="settings_lockscreen_setup_details">화면을 어떻게 잠그시겠습니까?</string>
     <string name="lockscreen_setup_title">휴대전화 보호</string>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index ac8eb3a0..4364ed44 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">دامەزراندنی گەزەک</string>
-    <!-- Partner SUW Strings -->
     <string name="next">دواتر</string>
     <string name="skip">تێپەڕاندن</string>
     <string name="start">دەستپێکردن</string>
@@ -49,6 +48,4 @@
     <string name="emergency_call">تەلەفۆنی فریاگوزاری</string>
     <string name="services_privacy_policy">یاسای تایبەتی</string>
     <string name="setup_unlock">کردنەوە</string>
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-ky/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 69c27493..58cc318c 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installatiounsassistent</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Weider</string>
     <string name="skip">Iwwersprangen</string>
     <string name="start">Start</string>
@@ -56,7 +55,6 @@
     <string name="setup_unlock">Entspären</string>
     <string name="setup_device_locked">Dësen Apparat gouf duerch de Benotzer gespaart.</string>
     <string name="setup_device_locked_instructions"><i>Fir dës Funktioun z\'aktivéieren/desaktivéieren, géi op Astellungen  &gt; Sécherheet</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Wiel den Typ vun der Ersatz-Schirmspär aus</string>
     <string name="settings_fingerprint_setup_details">Wéi wëlls du däi Schierm spären?</string>
     <string name="fingerprint_setup_title">Fangerofdrock ariichten</string>
@@ -64,6 +62,5 @@
     <string name="fingerprint_setup_backup_lock_method">Eng zweet Entspärmethod ariichten</string>
     <string name="fingerprint_setup_add_fingerprint">Däi Fangerofdrock dobäisetzen</string>
     <string name="fingerprint_setup_screen_lock_setup">D\'Schiermspär ariichten</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">Wéi wëlls du däi Schierm spären?</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-lo/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 91f39c16..16e61ced 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Sąrankos vediklis</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Kitas</string>
     <string name="skip">Praleisti</string>
     <string name="start">Pradėti</string>
@@ -56,7 +55,6 @@
     <string name="setup_unlock">Atrakinti</string>
     <string name="setup_device_locked">Šis įrenginys buvo užrakintas naudotojo.</string>
     <string name="setup_device_locked_instructions"><i>Kad išjungtumėte / įjungtumėte šią funkciją, eikite į Nustatymai &gt; Sauga</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Pasirinkite atsarginį ekrano užrakto tipą</string>
     <string name="settings_fingerprint_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
     <string name="fingerprint_setup_title">Pirštų atspaudų sąranka</string>
@@ -64,6 +62,5 @@
     <string name="fingerprint_setup_backup_lock_method">Nustatyti antrinį atrakinimo metodą</string>
     <string name="fingerprint_setup_add_fingerprint">Pridėti savo pirštų atspaudą</string>
     <string name="fingerprint_setup_screen_lock_setup">Nustatyti ekrano užraktą</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7dab9e06..d69b48dd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Uzstādīšanas vednis</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Tālāk</string>
     <string name="skip">Izlaist</string>
     <string name="start">Sākt</string>
@@ -56,7 +55,6 @@
     <string name="setup_unlock">Atbloķēt</string>
     <string name="setup_device_locked">Šo ierīci lietotājs ir bloķējis.</string>
     <string name="setup_device_locked_instructions"><i>Lai izslēgtu/ieslēgtu šo iespēju, lūdzu dodieties uz Iestatījumi &gt; Drošība</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Izvēlieties dublējuma ekrānslēga tipu</string>
     <string name="settings_fingerprint_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
     <string name="fingerprint_setup_title">Pirksta nospieduma iestatīšana</string>
@@ -64,6 +62,5 @@
     <string name="fingerprint_setup_backup_lock_method">Iestatīt sekundāro atbloķēšanas metodi</string>
     <string name="fingerprint_setup_add_fingerprint">Pievienot pirkstu nospiedumu</string>
     <string name="fingerprint_setup_screen_lock_setup">Iestatīt ekrānslēgu</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-mk/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7a4f527f..3f16e180 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">സജ്ജമാക്കല്‍ വിസാർഡ്</string>
-    <!-- Partner SUW Strings -->
     <string name="next">അടുത്തത്</string>
     <string name="skip">ഒഴിവാക്കുക</string>
     <string name="start">ആരംഭിക്കുക</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">അൺലോക്കുചെയ്യുക</string>
     <string name="setup_device_locked">ഈ ഉപകരണം ഉപയോക്താവ് ലോക്ക് ചെയ്തു.</string>
     <string name="setup_device_locked_instructions"><i>ഈ സവിശേഷത ഓഫ്/ഓൺ ചെയ്യുന്നതിന് ക്രമീകരണങ്ങൾ &gt; സുരക്ഷ എന്നതിലേക്ക് പോകുക</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് തരം തിരഞ്ഞെടുക്കുക</string>
     <string name="settings_fingerprint_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
     <string name="fingerprint_setup_title">വിരലടയാള സജ്ജീകരണം</string>
@@ -69,7 +67,6 @@
     <string name="fingerprint_setup_add_fingerprint">നിങ്ങളുടെ വിരലടയാളം ചേർക്കുക</string>
     <string name="fingerprint_setup_screen_lock_setup">സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക</string>
     <string name="sim_locale_changed">%1$s SIM കണ്ടെത്തി</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
     <string name="lockscreen_setup_title">നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക</string>
     <string name="lockscreen_setup_summary"><b>ഈ ഉപകരണം പരിരക്ഷിക്കുക</b>, സ്‌ക്രീൻ അൺലോക്കുചെയ്യാൻ പിൻ,പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് ആവശ്യമാണ്</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-mn/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 5ee0eee5..937d4d0e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">सेटअप विझार्ड</string>
-    <!-- Partner SUW Strings -->
     <string name="next">पुढील</string>
     <string name="skip">वगळा</string>
     <string name="start">प्रारंभ करा</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">अनलॉक करा</string>
     <string name="setup_device_locked">हे डिव्हाइस वापरकर्त्याने लॉक केले आहे.</string>
     <string name="setup_device_locked_instructions"><i>हे वैशिष्ट्य बंद/चालू करण्यासाठी, कृपया सेटिंग्ज &gt; सुरक्षा कडे जा</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">बॅकअप स्क्रीन लॉक टाईप निवडा</string>
     <string name="settings_fingerprint_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
     <string name="fingerprint_setup_title">बोटाचा ठसा सेटअप</string>
@@ -69,7 +67,6 @@
     <string name="fingerprint_setup_add_fingerprint">तुमचा बोटाचा ठसा जोडा</string>
     <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करा</string>
     <string name="sim_locale_changed">%1$s सिम आढळले</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
     <string name="lockscreen_setup_title">आपला फोन संरक्षित करा</string>
     <string name="lockscreen_setup_summary"><b>हे डिव्हाइस संरक्षित करा</b> आणि स्क्रीन अनलॉक करण्यासाठी पिन, नमुना किंवा संकेतशब्द आवश्यक आहे</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-ms/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-my/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 522dc753..7bb59ee7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Oppsettsveiviser</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Neste</string>
     <string name="skip">Hopp over</string>
     <string name="start">Start</string>
@@ -67,7 +66,6 @@
     <string name="setup_device_locked">Denne enheten er låst av brukeren.</string>
     <string name="setup_require_cyanogen_label"><b>Krev passord til konto</b> for å bruke enheten etter en fabrikkgjennoppretting.</string>
     <string name="setup_device_locked_instructions"><i>For å slå denne funksjonen av/på, kan du gå til Innstillinger &gt; sikkerhet</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Velg alternativ skjermlåstype</string>
     <string name="settings_fingerprint_setup_details">Hvordan vil du låse skjermen din?</string>
     <string name="fingerprint_setup_title">Fingeravtrykksoppsett</string>
@@ -76,7 +74,6 @@
     <string name="fingerprint_setup_add_fingerprint">Legge til fingeravtrykket ditt</string>
     <string name="fingerprint_setup_screen_lock_setup">Konfigurere skjermlås</string>
     <string name="sim_locale_changed">%1$s SIM oppdaget</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Velg skjermlåstype</string>
     <string name="settings_lockscreen_setup_details">Hvordan vil du låse skjermen din?</string>
     <string name="lockscreen_setup_title">Beskytt telefonen</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-ne/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3107ccf6..129b21d1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistent voor instellen</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Volgende</string>
     <string name="skip">Overslaan</string>
     <string name="start">Start</string>
@@ -68,7 +67,6 @@
     <string name="setup_device_locked">Dit apparaat is vergrendeld door de gebruiker.</string>
     <string name="setup_require_cyanogen_label"><b>Uw accountwachtwoord vereisen</b> om het apparaat te gebruiken, zelfs na terugzetten naar fabrieksinstellingen.</string>
     <string name="setup_device_locked_instructions"><i>Om deze functie in of uit te schakelen, ga naar Instellingen &gt; Beveiliging</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Back-up selecteren voor schermvergrendeling</string>
     <string name="settings_fingerprint_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
     <string name="fingerprint_setup_title">Vingerafdruk instellen</string>
@@ -77,7 +75,6 @@
     <string name="fingerprint_setup_add_fingerprint">Uw vingerafdruk toe te voegen</string>
     <string name="fingerprint_setup_screen_lock_setup">Schermvergrendeling in te stellen</string>
     <string name="sim_locale_changed">%1$s simkaart gedetecteerd</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Schermvergrendelingstype selecteren</string>
     <string name="settings_lockscreen_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
     <string name="lockscreen_setup_title">Bescherm uw telefoon</string>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-oc/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7fc8ff65..7b94808f 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">ୱି୍ଜାର୍ଡ ସେଟଅପ୍‍ କରନ୍ତୁ</string>
-    <!-- Partner SUW Strings -->
     <string name="next">ପରବର୍ତ୍ତୀ</string>
     <string name="skip">ସ୍କିପ୍</string>
     <string name="start">ଆରମ୍ଭ</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">ଅନଲକ୍</string>
     <string name="setup_device_locked">ଏହି ଡିଭାଇସ୍‍ ଉପଭୋକ୍ତାଙ୍କ ଦ୍ୱାରା ଲକ୍‍ ହୋଇଛି।</string>
     <string name="setup_device_locked_instructions"><i>ଏହି ବୈଶିଷ୍ଟ୍ୟ ଅଫ୍‍/ଅନ୍‍ କରିବା ପାଇଁ, ଦୟାକରି ସେଟିଂସ୍‍&gt;ସୁର‍କ୍ଷାକୁ ଯାଆନ୍ତୁ</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">ବ୍ୟାକ୍‍ଅପ୍‍ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ପ୍ରକାର ଚୟନ କରନ୍ତୁ</string>
     <string name="settings_fingerprint_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
     <string name="fingerprint_setup_title">ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ସେଟ୍‍ଅପ୍‍</string>
@@ -69,6 +67,5 @@
     <string name="fingerprint_setup_add_fingerprint">ଆପଣଙ୍କ ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ଯୋଗ କରନ୍ତୁ</string>
     <string name="fingerprint_setup_screen_lock_setup">ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
     <string name="sim_locale_changed">%1$s SIM ସନ୍ଧାନ କରାଯାଇଛି</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-pa/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5713bdf2..5736fec2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Kreator konfiguracji</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Dalej</string>
     <string name="skip">Pomiń</string>
     <string name="start">Rozpocznij</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">To urządzenie zostało zablokowane przez użytkownika.</string>
     <string name="setup_require_cyanogen_label"><b>Wymagaj hasła do konta</b>, aby korzystać z urządzenia nawet po przywróceniu ustawień fabrycznych.</string>
     <string name="setup_device_locked_instructions"><i>Aby włączyć/wyłączyć tę funkcję, przejdź do Ustawienia &gt; Zabezpieczenia</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Wybierz zapasową opcję blokady ekranu</string>
     <string name="settings_fingerprint_setup_details">Jak chcesz blokować swój ekran?</string>
     <string name="fingerprint_setup_title">Konfiguracja odcisków palców</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Dodać swój odcisk palca</string>
     <string name="fingerprint_setup_screen_lock_setup">Skonfigurować blokadę ekranu</string>
     <string name="sim_locale_changed">Wykryto %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Wybierz typ blokady ekranu</string>
     <string name="settings_lockscreen_setup_details">Jak chcesz blokować swój ekran?</string>
     <string name="lockscreen_setup_title">Zabezpiecz telefon</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8daa35ed..2fad5d62 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistente de configuração</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Próximo</string>
     <string name="skip">Pular</string>
     <string name="start">Início</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Este dispositivo foi bloqueado pelo usuário.</string>
     <string name="setup_require_cyanogen_label"><b>Exigir a senha de sua conta</b> para usar o dispositivo mesmo depois de restaurar os padrões de fábrica.</string>
     <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá para Configurações e Segurança</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio de tela do backup</string>
     <string name="settings_fingerprint_setup_details">Como você gostaria de bloquear a tela?</string>
     <string name="fingerprint_setup_title">Configuração de impressão digital</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Adicionar sua impressão digital</string>
     <string name="fingerprint_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
     <string name="sim_locale_changed">Cartão SIM %1$s detectado</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Selecione o tipo de bloqueio de tela</string>
     <string name="settings_lockscreen_setup_details">Como você gostaria de bloquear a tela?</string>
     <string name="lockscreen_setup_title">Proteger seu smartphone</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7e280673..402b42f1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistente de configuração</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Próximo</string>
     <string name="skip">Saltar</string>
     <string name="start">Início</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Este dispositivo foi bloqueado pelo utilizador.</string>
     <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da sua conta</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string>
     <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições de Segurança</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio do ecrã da cópia de segurança</string>
     <string name="settings_fingerprint_setup_details">Como gostaria de bloquear o seu ecrã?</string>
     <string name="fingerprint_setup_title">Configuração de impressão digital</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Adicionar a sua impressão digital</string>
     <string name="fingerprint_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
     <string name="sim_locale_changed">Cartão SIM %1$s detetado</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Selecionar o tipo de bloqueio do ecrã</string>
     <string name="settings_lockscreen_setup_details">Como gostaria de bloquear o seu ecrã?</string>
     <string name="lockscreen_setup_title">Proteja o seu telefone</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-rm/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f46248bf..b15a1cca 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Expert de instalare</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Următoarea</string>
     <string name="skip">Omite</string>
     <string name="start">Pornire</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Acest dispozitiv a fost blocat de utilizator.</string>
     <string name="setup_require_cyanogen_label"><b>Este necesară parola contului dvs.</b> pentru a vă utiliza dispozitivul după fiecare resetare la datele din fabrică.</string>
     <string name="setup_device_locked_instructions"><i>Pentru a activa sau dezactiva această caracteristică, vă rugăm să mergeți la Setări &gt; securitate</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Selectați tipul de blocare ecran de rezervă</string>
     <string name="settings_fingerprint_setup_details">Cum doriți să vă blocați ecranul?</string>
     <string name="fingerprint_setup_title">Configurare amprentă</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Adăugați-vă amprenta</string>
     <string name="fingerprint_setup_screen_lock_setup">Setați blocarea de ecran</string>
     <string name="sim_locale_changed">SIM %1$s detectat</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Selectați tipul de blocare ecran</string>
     <string name="settings_lockscreen_setup_details">Cum doriți să vă blocați ecranul?</string>
     <string name="lockscreen_setup_title">Protejați telefonul</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index caaf142b..ee7252a7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Мастер настройки</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Далее</string>
     <string name="skip">Пропустить</string>
     <string name="start">Начать</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Устройство заблокировано пользователем.</string>
     <string name="setup_require_cyanogen_label"><b>Требовать пароль входа в аккаунт</b> для использования устройства даже после сброса настроек.</string>
     <string name="setup_device_locked_instructions"><i>Чтобы включить или отключить эту функцию, перейдите в меню «Настройки &gt; Безопасность»</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Выберите запасной режим блокировки экрана</string>
     <string name="settings_fingerprint_setup_details">Как следует блокировать экран?</string>
     <string name="fingerprint_setup_title">Настройка отпечатков пальцев</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Добавить ваши отпечатки</string>
     <string name="fingerprint_setup_screen_lock_setup">Настроить экран блокировки</string>
     <string name="sim_locale_changed">Обнаружена %1$s SIM-карта</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Выбрать способ блокировки экрана</string>
     <string name="settings_lockscreen_setup_details">Как вы хотите заблокировать ваш экран?</string>
     <string name="lockscreen_setup_title">Защитите свой телефон</string>
diff --git a/res/values-sc-rIT/strings.xml b/res/values-sc-rIT/strings.xml
index 162fa4f6..19232026 100644
--- a/res/values-sc-rIT/strings.xml
+++ b/res/values-sc-rIT/strings.xml
@@ -17,7 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
     <string name="skip">Brinca</string>
     <string name="start">Incumintza</string>
     <string name="done">Fatu</string>
@@ -26,6 +25,4 @@
     <string name="no">Nono</string>
     <string name="yes">Eja</string>
     <string name="services_privacy_policy">Polìtica de riservadesa</string>
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-si/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f36f45cf..ff297b0d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Sprievodca nastavením</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Ďalej</string>
     <string name="skip">Preskočiť</string>
     <string name="start">Spustiť</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Toto zariadenie bolo uzamknuté používateľom.</string>
     <string name="setup_require_cyanogen_label"><b>Vyžadovať heslo vášho účtu</b> na používanie vášho zariadenia aj po obnove továrenských nastavení.</string>
     <string name="setup_device_locked_instructions"><i>Na vypnutie/zapnutie tejto funkcie prejdite do Nastavenia &gt; Zabezpečenie</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Vyberte záložný typ zamknutia obrazovky</string>
     <string name="settings_fingerprint_setup_details">Ako chcete zamknúť obrazovku?</string>
     <string name="fingerprint_setup_title">Nastavenie odtlačkov prstov</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Pridať váš odtlačok prsta</string>
     <string name="fingerprint_setup_screen_lock_setup">Nastaviť zamknutie obrazovky</string>
     <string name="sim_locale_changed">Zistená %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Vyberte typ zámku obrazovky</string>
     <string name="settings_lockscreen_setup_details">Ako chcete zamknúť obrazovku?</string>
     <string name="lockscreen_setup_title">Chráňte svoj telefón</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 93b6ac28..0739d285 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Čarovnik za namestitev</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Naprej</string>
     <string name="skip">Preskoči</string>
     <string name="start">Začni</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">To napravo je zaklenil uporabnik.</string>
     <string name="setup_require_cyanogen_label"><b>Zahtevajte svoje geslo računa</b>, da uporabite svojo napravo tudi po ponastavitvi na tovarniške vrednosti.</string>
     <string name="setup_device_locked_instructions"><i>Za vklop/izklop te značilnosti pojdite v Nastavitve &gt; Varnost</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Izberite nadomestni način zaklepanja zaslona</string>
     <string name="settings_fingerprint_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
     <string name="fingerprint_setup_title">Nastavitev prstnega odtisa</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Dodajte vaš prstni odtis</string>
     <string name="fingerprint_setup_screen_lock_setup">Nastavitev zaklepanja zaslona</string>
     <string name="sim_locale_changed">%1$s kartica SIM zaznana</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Izberite način zaklepanja zaslona</string>
     <string name="settings_lockscreen_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
     <string name="lockscreen_setup_title">Zaščitite vaš telefon</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index ed13d166..7bf21b13 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Asistenti i Konfigurimit</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Vazhdo</string>
     <string name="skip">Jo tani</string>
     <string name="start">Fillo</string>
@@ -62,7 +61,6 @@
     <string name="setup_device_locked">Kjo pajisje është bllokuar nga përdoruesi.</string>
     <string name="setup_require_cyanogen_label"><b>Kërko vendosjen e fjalëkalimit të llogarisë</b> për të përdorur pajisjen edhe pas rikthimit në gjëndjen e fabrikës.</string>
     <string name="setup_device_locked_instructions"><i>Për të aktivizuar/çaktivizuar këtë funksion, shko tek Parametrat &gt; Siguria</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Zgjidh mënyrën rezervë të bllokimit të ekranit</string>
     <string name="settings_fingerprint_setup_details">Si doni që ta bllokoni ekranin?</string>
     <string name="fingerprint_setup_title">Konfigurimi i shenjave të gishtave</string>
@@ -71,7 +69,6 @@
     <string name="fingerprint_setup_add_fingerprint">Shtosh shenjat e gishtave</string>
     <string name="fingerprint_setup_screen_lock_setup">Konfigurosh bllokimin e ekranit</string>
     <string name="sim_locale_changed">%1$s SIM u lidh</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Zgjidh mënyrën e bllokimit të ekranit</string>
     <string name="settings_lockscreen_setup_details">Si doni ta bllokoni ekranin?</string>
     <string name="lockscreen_setup_title">Mbro telefonin</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 49ffb6b4..9e883dd6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Чаробњак за подешавање</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Следеће</string>
     <string name="skip">Прескочи</string>
     <string name="start">Започни</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Корисник је закључао уређај.</string>
     <string name="setup_require_cyanogen_label"><b>Захтевајте лозинку налога</b> за коришћење уређаја, чак и након враћања фабричких подешавања.</string>
     <string name="setup_device_locked_instructions"><i>Да бисте искључили или укључили ову функцију, идите у мени Подешавања &gt; Безбедност“</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Изаберите алтернативно закључавање екрана</string>
     <string name="settings_fingerprint_setup_details">Како желите да закључате екран?</string>
     <string name="fingerprint_setup_title">Подешавање сензора за отисак прста</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Додајте отисак прста</string>
     <string name="fingerprint_setup_screen_lock_setup">Подесите закључавање екрана</string>
     <string name="sim_locale_changed">Препозната је %1$s SIM картица</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Изаберите метод закључавања екрана</string>
     <string name="settings_lockscreen_setup_details">Како желите да закључате екран?</string>
     <string name="lockscreen_setup_title">Заштитите телефон</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index acfce7ed..7ffcc0ab 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installationsguide</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Nästa</string>
     <string name="skip">Hoppa över</string>
     <string name="start">Start</string>
@@ -63,7 +62,6 @@
     <string name="setup_unlock">Lås upp</string>
     <string name="setup_device_locked">Denna enhet har blivit låst av användaren.</string>
     <string name="setup_device_locked_instructions"><i>För att slå av/på denna funktion, gå till Inställningar &gt; Säkerhet</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Välj alternativ skärmlåsningstyp</string>
     <string name="settings_fingerprint_setup_details">Hur vill du låsa din skärm?</string>
     <string name="fingerprint_setup_title">Konfigurering av fingeravtryck</string>
@@ -72,7 +70,6 @@
     <string name="fingerprint_setup_add_fingerprint">Lägga till ditt fingeravtryck</string>
     <string name="fingerprint_setup_screen_lock_setup">Konfigurera skärmlås</string>
     <string name="sim_locale_changed">%1$s SIM upptäckt</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Välj skärmlåstyp</string>
     <string name="settings_lockscreen_setup_details">Hur vill du låsa din skärm?</string>
     <string name="lockscreen_setup_title">Skydda mobilen</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-sw/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 292f9aff..a27911d2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">அமைப்பு வழிகாட்டி</string>
-    <!-- Partner SUW Strings -->
     <string name="next">அடுத்து</string>
     <string name="skip">தவிர்</string>
     <string name="start">தொடங்கு</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">தடைநீக்கு</string>
     <string name="setup_device_locked">இந்த சாதனமானது பயனரால் பூட்டப்பட்டது.</string>
     <string name="setup_device_locked_instructions"><i>இந்த அம்சத்தை ஆஃப்/ஆன் செய்ய, தயவுசெய்து செல்லுங்கள் அமைப்புகள் &gt; பாதுகாப்பு</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">மறுபிரதி திரை பூட்டு வகையை தேர்வுசெய்க</string>
     <string name="settings_fingerprint_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
     <string name="fingerprint_setup_title">கைரேகையை அமைக்கவும்</string>
@@ -69,7 +67,6 @@
     <string name="fingerprint_setup_add_fingerprint">கைரேகையைச் சேர்க்கவும்</string>
     <string name="fingerprint_setup_screen_lock_setup">திரைப் பூட்டை அமை</string>
     <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது.</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
     <string name="lockscreen_setup_title">மொபைலைப் பாதுகாக்கவும்</string>
     <string name="lockscreen_setup_summary">திரையை திறக்க பின், வடிவம் அல்லது கடவுச்சொல் கேட்கும்படி அமைத்து, <b>சாதனத்தைப் பாதுகாக்கலாம்</b></string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f86cd5bb..eef233bd 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">స్థాపక నిర్దేశకం</string>
-    <!-- Partner SUW Strings -->
     <string name="next">తదుపరి</string>
     <string name="skip">దాటవేయి</string>
     <string name="start">ప్రారంభించు</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">అన్‌లాక్ చేయండి</string>
     <string name="setup_device_locked">ఈ పరికరం వినియోగాదారునిచే లాక్ చేయబడింది.</string>
     <string name="setup_device_locked_instructions"><i>ఈ లక్షణాన్ని ఆఫ్/ఆన్ చేసేందుకు, దయచేసి సెట్టింగులు &gt; సెక్యూరిటీ కు వెళ్ళండి</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">నకలు నిల్వ లాక్ రకాన్ని ఎంచుకొనుము</string>
     <string name="settings_fingerprint_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
     <string name="fingerprint_setup_title">వేలిముద్ర సెటప్</string>
@@ -69,7 +67,6 @@
     <string name="fingerprint_setup_add_fingerprint">మీ వేలిముద్రను జోడించండి</string>
     <string name="fingerprint_setup_screen_lock_setup">సెటప్ స్క్రీన్ లాక్</string>
     <string name="sim_locale_changed">%1$s SIM కనుగొనబడింది</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
     <string name="lockscreen_setup_title">మీ ఫోన్‌ను రక్షించుకోండి</string>
     <string name="lockscreen_setup_summary"><b>ఈ పరికరాన్ని రక్షించండి</b> మరియు స్క్రీన్‌ను అన్‌లాక్ చేయడానికి PIN, నమూనా లేదా పాస్‌వర్డ్ అవసరమయ్యేలా ఏర్పాటు చేయండి</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 96824f0e..5c86cb22 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">เปิดใช้ครั้งแรก</string>
-    <!-- Partner SUW Strings -->
     <string name="next">ถัดไป</string>
     <string name="skip">ข้าม</string>
     <string name="start">เริ่มต้น</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">ปลดล็อค</string>
     <string name="setup_device_locked">อุปกรณ์นี้ถูกล็อคโดยผู้ใช้</string>
     <string name="setup_device_locked_instructions"><i>เพื่อปิด/เปิดคุณสมบัตินี้ กรุณาไปที่ การตั้งค่า &gt; ความปลอดภัย</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">เลือกประเภทการล็อคหน้าจอสำรอง</string>
     <string name="settings_fingerprint_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
     <string name="fingerprint_setup_title">การตั้งค่าลายนิ้วมือ</string>
@@ -69,7 +67,6 @@
     <string name="fingerprint_setup_add_fingerprint">เพิ่มลายนิ้วมือของคุณ</string>
     <string name="fingerprint_setup_screen_lock_setup">ตั้งค่าการล็อคหน้าจอ</string>
     <string name="sim_locale_changed">ตรวจพบซิม %1$s</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
     <string name="lockscreen_setup_title">ปกป้องโทรศัพท์ของคุณ</string>
     <string name="lockscreen_setup_summary"><b>ปกป้องอุปกรณ์นี้</b>และกำหนดให้มีการใช้ PIN, รูปแบบ หรือรหัสผ่านเพื่อปลดล็อกหน้าจอ</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-tl/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 37b9b896..0d6177f7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Kurulum Sihirbazı</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Sonraki</string>
     <string name="skip">Atla</string>
     <string name="start">Başla</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Bu cihaz kullanıcı tarafından kilitlenmiş.</string>
     <string name="setup_require_cyanogen_label"><b>Hesap parolanız</b> cihazınızı sıfırladıktan sonra kullanabilmek için gereklidir.</string>
     <string name="setup_device_locked_instructions"><i>Bu özelliği açıp kapatmak için lütfen Ayarlar &gt; Güvenlik bölümüne gidin</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Yedek ekran kilidi türü seçin</string>
     <string name="settings_fingerprint_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
     <string name="fingerprint_setup_title">Parmak izi kurulumu</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Parmak izinizi ekleyin</string>
     <string name="fingerprint_setup_screen_lock_setup">Ekran kilidini kurun</string>
     <string name="sim_locale_changed">%1$s SIM tespit edildi</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Ekran kilidi türünü seçin</string>
     <string name="settings_lockscreen_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
     <string name="lockscreen_setup_title">Telefonunuzu koruyun</string>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 27805e65..770173a3 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">تەڭشەك يېتەكچىسى</string>
-    <!-- Partner SUW Strings -->
     <string name="next">كېيىنكى</string>
     <string name="skip">ئاتلاش</string>
     <string name="start">باشلاش</string>
@@ -60,7 +59,6 @@
     <string name="setup_unlock">قۇلۇپ ئېچىش</string>
     <string name="setup_device_locked">بۇ ئۈسكىنى باشقىلار قۇلۇپلاپ قويغان.</string>
     <string name="setup_device_locked_instructions"><i>بۇ ئىقىتىدارنى ئېچىپ تاقاش ئۈچۈن، تەڭشەكلەر&gt; بىخەتەرلىككە كىرىڭ</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">زاپاس قۇلۇپ تىپىنى تاللاڭ</string>
     <string name="settings_fingerprint_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
     <string name="fingerprint_setup_title">بارماق ئىزى تەڭشىكى</string>
@@ -69,6 +67,5 @@
     <string name="fingerprint_setup_add_fingerprint">بارماق ئىزى قوشۇڭ</string>
     <string name="fingerprint_setup_screen_lock_setup">ئېكران قۇلۇپ تەڭشىكى</string>
     <string name="sim_locale_changed">ھازىر %1$s دانە SIM كارتا بايقىدى</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a2570566..f806f3d7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Майстер налаштування</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Далі</string>
     <string name="skip">Пропустити</string>
     <string name="start">Почати</string>
@@ -68,7 +67,6 @@
     <string name="setup_device_locked">Цей пристрій заблоковано користувачем.</string>
     <string name="setup_require_cyanogen_label"><b>Необхідний пароль</b> для використання Вашого пристрою навіть після скидання до заводських налаштувань.</string>
     <string name="setup_device_locked_instructions"><i>Щоб увімкнути/вимкнути цю функцію, будь ласка, перейдіть до Налаштування &gt; Безпека</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Виберіть резервний спосіб розблокування екрана</string>
     <string name="settings_fingerprint_setup_details">Як би ви хотіли блокувати екран?</string>
     <string name="fingerprint_setup_title">Налаштування відбитку пальця</string>
@@ -77,7 +75,6 @@
     <string name="fingerprint_setup_add_fingerprint">Додати ваш відбиток пальця</string>
     <string name="fingerprint_setup_screen_lock_setup">Налаштування блокування екрану</string>
     <string name="sim_locale_changed">%1$s SIM-карту виявлено</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Виберіть тип блокування екрану</string>
     <string name="settings_lockscreen_setup_details">Як би ви хотіли блокувати екран?</string>
     <string name="lockscreen_setup_title">Захистіть свій телефон</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-ur/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-uz/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-vec/strings.xml b/res/values-vec/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-vec/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b43797eb..a5ccd717 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Trình hướng dẫn thiết lập</string>
-    <!-- Partner SUW Strings -->
     <string name="next">Tiếp theo</string>
     <string name="skip">Bỏ qua</string>
     <string name="start">Bắt đầu</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">Thiết bị này đã bị khoá bởi người dùng.</string>
     <string name="setup_require_cyanogen_label"><b>Yêu cầu mật khẩu tài khoản của bạn</b> để sử dụng thiết bị của bạn ngay cả sau khi đặt lại cài đặt gốc.</string>
     <string name="setup_device_locked_instructions"><i>Để bật/tắt tính năng này, hãy truy cập Cài đặt &gt; bảo mật</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">Chọn kiểu khóa màn hình dự phòng</string>
     <string name="settings_fingerprint_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
     <string name="fingerprint_setup_title">Thiết lập vân tay</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">Thêm vân tay của bạn</string>
     <string name="fingerprint_setup_screen_lock_setup">Thiết lập khóa màn hình</string>
     <string name="sim_locale_changed">Đã phát hiện %1$s SIM</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">Chọn kiểu khóa màn hình</string>
     <string name="settings_lockscreen_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
     <string name="lockscreen_setup_title">Bảo vệ điện thoại của bạn</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 57b59532..57bb159f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">设置向导</string>
-    <!-- Partner SUW Strings -->
     <string name="next">下一步</string>
     <string name="skip">跳过</string>
     <string name="start">开始</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">此设备的持有者锁定了该设备。</string>
     <string name="setup_require_cyanogen_label"><b>需要您的帐户密码</b>以使用您的设备，甚至在重置之后。</string>
     <string name="setup_device_locked_instructions"><i>要开启或关闭此功能，请进入设置 &gt; 安全</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">选择备用屏幕锁定类型</string>
     <string name="settings_fingerprint_setup_details">您希望如何锁定您的屏幕？</string>
     <string name="fingerprint_setup_title">指纹设置</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">添加您的指纹</string>
     <string name="fingerprint_setup_screen_lock_setup">设置屏幕锁定</string>
     <string name="sim_locale_changed">检测到 %1$s SIM 卡</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">选择屏幕锁定类型</string>
     <string name="settings_lockscreen_setup_details">您希望如何锁定您的屏幕？</string>
     <string name="lockscreen_setup_title">为您的手机启用保护功能</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4bc7f0e6..2ed2a923 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -17,7 +17,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Partner SUW Strings -->
     <string name="next">下一步</string>
     <string name="skip">略過</string>
     <string name="start">開始</string>
@@ -53,7 +52,6 @@
     <string name="services_os_nav_keys_label"><b>使用虛擬按鍵</b>而非實體按鍵。</string>
     <string name="setup_unlock">解鎖</string>
     <string name="setup_device_locked_instructions"><i>如要開啟/關閉此功能，請至設定 &gt; 安全性</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">選擇備用螢幕鎖類型</string>
     <string name="settings_fingerprint_setup_details">您希望如何鎖定螢幕？</string>
     <string name="fingerprint_setup_title">指紋感應設定</string>
@@ -61,6 +59,5 @@
     <string name="fingerprint_setup_backup_lock_method">設定第二個解鎖方式</string>
     <string name="fingerprint_setup_add_fingerprint">新增您的指紋</string>
     <string name="fingerprint_setup_screen_lock_setup">設定螢幕鎖定</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_details">您希望如何鎖定螢幕？</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 12ed210f..7161ad96 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">設定精靈</string>
-    <!-- Partner SUW Strings -->
     <string name="next">下一步</string>
     <string name="skip">略過</string>
     <string name="start">開始</string>
@@ -69,7 +68,6 @@
     <string name="setup_device_locked">已被使用者鎖定此裝置。</string>
     <string name="setup_require_cyanogen_label"><b>需要您的帳戶密碼</b> 即可使用您的裝置，即使在重設裝置之後。</string>
     <string name="setup_device_locked_instructions"><i>如要開啟/關閉此功能，請到設定 &gt; 安全性</i></string>
-    <!-- Fingerprint setup -->
     <string name="settings_fingerprint_setup_title">選擇備用螢幕鎖定類型</string>
     <string name="settings_fingerprint_setup_details">您想如何鎖定畫面？</string>
     <string name="fingerprint_setup_title">指紋設定</string>
@@ -78,7 +76,6 @@
     <string name="fingerprint_setup_add_fingerprint">新增您的指紋</string>
     <string name="fingerprint_setup_screen_lock_setup">設定畫面鎖定</string>
     <string name="sim_locale_changed">檢測到 %1$s 張 SIM 卡</string>
-    <!-- secure lock screen -->
     <string name="settings_lockscreen_setup_title">選擇螢幕鎖類型</string>
     <string name="settings_lockscreen_setup_details">您想如何鎖定畫面？</string>
     <string name="lockscreen_setup_title">保護您的手機</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
deleted file mode 100644
index 0c759fb5..00000000
--- a/res/values-zu/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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">
-    <!-- Partner SUW Strings -->
-    <!-- Fingerprint setup -->
-    <!-- secure lock screen -->
-</resources>