diff --git a/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk
index e0d82fa07..ca646487f 100644
--- a/AdvancedDisplay/Android.mk
+++ b/AdvancedDisplay/Android.mk
@@ -8,31 +8,24 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := AdvancedDisplay
 LOCAL_CERTIFICATE := platform
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_USE_AAPT2 := true
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v7-appcompat \
     android-support-v7-preference \
     android-support-v7-recyclerview \
     android-support-v13 \
-    android-support-v14-preference \
-    org.lineageos.platform.internal
+    android-support-v14-preference
 
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    org.lineageos.platform.internal
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res \
-    $(TOP)/packages/resources/devicesettings/res \
-    frameworks/support/v14/preference/res \
-    frameworks/support/v7/appcompat/res \
-    frameworks/support/v7/preference/res \
-    frameworks/support/v7/recyclerview/res
-
-LOCAL_AAPT_FLAGS := \
-    --auto-add-overlay \
-    --extra-packages android.support.v14.preference \
-    --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.v7.preference \
-    --extra-packages android.support.v7.recyclerview
+    $(TOP)/packages/resources/devicesettings/res
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
diff --git a/AdvancedDisplay/res/values-af/arrays.xml b/AdvancedDisplay/res/values-af/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-af/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-af/strings.xml b/AdvancedDisplay/res/values-af/strings.xml
index 422ece12c..1bcd937fb 100644
--- a/AdvancedDisplay/res/values-af/strings.xml
+++ b/AdvancedDisplay/res/values-af/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Gevorderde skerm</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Skerm</string>
-  <string name="screen_colors_title">Kleure</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Stel die mDNIe scenario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Gevorderde skerm</string>
+    <string name="category_screen_title">Skerm</string>
+    <string name="screen_colors_title">Kleure</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Stel die mDNIe scenario</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-am/arrays.xml b/AdvancedDisplay/res/values-am/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-am/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ar/arrays.xml b/AdvancedDisplay/res/values-ar/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ar/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ar/strings.xml b/AdvancedDisplay/res/values-ar/strings.xml
index 70bdc8908..bf88b35da 100644
--- a/AdvancedDisplay/res/values-ar/strings.xml
+++ b/AdvancedDisplay/res/values-ar/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">عرض متقدم</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">الشاشة</string>
-  <string name="screen_colors_title">الألوان</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">السيناريو</string>
-  <string name="mdnie_scenario_summary_head">تعيين السيناريو mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">عرض متقدم</string>
+    <string name="category_screen_title">الشاشة</string>
+    <string name="screen_colors_title">الألوان</string>
+    <string name="mdnie_scenario_title_head">السيناريو</string>
+    <string name="mdnie_scenario_summary_head">تعيين السيناريو mDNIe</string>
+    <string name="mdnie_accessibility_title_head">وضع إمكانية الوصول</string>
+    <string name="mdnie_accessibility_summary_head">قم بتعيين وضع إمكانية الوصول mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (الافتراضي)</string>
+    <string name="mdnie_scenario_video">فيديو</string>
+    <string name="mdnie_scenario_video_warm">فيديو دافئ</string>
+    <string name="mdnie_scenario_video_cold">فيديو بارد</string>
+    <string name="mdnie_scenario_camera">الكاميرا</string>
+    <string name="mdnie_scenario_navigation">التنقل</string>
+    <string name="mdnie_scenario_gallery">المعرض</string>
+    <string name="mdnie_scenario_vt">مكالمة فيديو</string>
+    <string name="mdnie_scenario_browser">المتصفح</string>
+    <string name="mdnie_scenario_ebook">كتاب الكتروني</string>
+    <string name="mdnie_scenario_email">البريد الإلكتروني</string>
+    <string name="mdnie_scenario_tdmb">التلفزيون الرقمي</string>
+    <string name="mdnie_accessibility_normal">عادي</string>
+    <string name="mdnie_accessibility_inverse">معكوس</string>
+    <string name="mdnie_accessibility_color_blind">عمى الألوان</string>
+    <string name="mdnie_accessibility_screen_curtain">حجب الشاشة</string>
+    <string name="mdnie_accessibility_grayscale">رمادي</string>
+    <string name="mdnie_accessibility_gray_negative">رمادي معكوس</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-as-rIN/arrays.xml b/AdvancedDisplay/res/values-as-rIN/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-as-rIN/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-as-rIN/strings.xml b/AdvancedDisplay/res/values-as-rIN/strings.xml
index fb903c06e..973505a46 100644
--- a/AdvancedDisplay/res/values-as-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-as-rIN/strings.xml
@@ -17,14 +17,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">উন্নত প্রদর্শন</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">স্ক্ৰীণ</string>
-  <string name="screen_colors_title">ৰংসমূহ</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">দৃশ্যপট</string>
-  <string name="mdnie_scenario_summary_head">mDNIe দৃশ্যপট ছেট কৰক</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">উন্নত প্রদর্শন</string>
+    <string name="category_screen_title">স্ক্ৰীণ</string>
+    <string name="screen_colors_title">ৰংসমূহ</string>
+    <string name="mdnie_scenario_title_head">দৃশ্যপট</string>
+    <string name="mdnie_scenario_summary_head">mDNIe দৃশ্যপট ছেট কৰক</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-bn/strings.xml b/AdvancedDisplay/res/values-as/strings.xml
similarity index 66%
rename from AdvancedDisplay/res/values-bn/strings.xml
rename to AdvancedDisplay/res/values-as/strings.xml
index c155d8901..03b155e3e 100644
--- a/AdvancedDisplay/res/values-bn/strings.xml
+++ b/AdvancedDisplay/res/values-as/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">উন্নত প্রদর্শন</string>
+    <string name="category_screen_title">স্ক্ৰীণ</string>
+    <string name="screen_colors_title">ৰংসমূহ</string>
+    <string name="mdnie_scenario_title_head">দৃশ্যপট</string>
+    <string name="mdnie_scenario_summary_head">mDNIe দৃশ্যপট ছেট কৰক</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ast-rES/arrays.xml b/AdvancedDisplay/res/values-ast-rES/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ast-rES/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ast-rES/strings.xml b/AdvancedDisplay/res/values-ast-rES/strings.xml
index b8d99aa27..08f76aba7 100644
--- a/AdvancedDisplay/res/values-ast-rES/strings.xml
+++ b/AdvancedDisplay/res/values-ast-rES/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Visualización avanzada</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Pantalla</string>
-  <string name="screen_colors_title">Colores</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Escenariu</string>
-  <string name="mdnie_scenario_summary_head">Afita l\'escenariu mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="mdnie_scenario_ui">LineageOS (por defeutu)</string>
+    <string name="mdnie_scenario_camera">Cámara</string>
+    <string name="mdnie_scenario_navigation">Navegación</string>
+    <string name="mdnie_scenario_gallery">Galería</string>
+    <string name="mdnie_scenario_vt">Videollamada</string>
+    <string name="mdnie_scenario_browser">Restolador</string>
+    <string name="mdnie_scenario_ebook">Llibru electrónicu</string>
+    <string name="mdnie_scenario_email">Corréu electrónicu</string>
+    <string name="mdnie_scenario_tdmb">Televisión dixital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-az/arrays.xml b/AdvancedDisplay/res/values-az/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-az/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-az/strings.xml b/AdvancedDisplay/res/values-az/strings.xml
index 022ffb5d6..b69876539 100644
--- a/AdvancedDisplay/res/values-az/strings.xml
+++ b/AdvancedDisplay/res/values-az/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Qabaqcıl ekran</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ekran</string>
-  <string name="screen_colors_title">Rənglər</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Ekran rejimi</string>
-  <string name="mdnie_scenario_summary_head">mDNle ssenarisini tənzimlə</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Qabaqcıl ekran</string>
+    <string name="category_screen_title">Ekran</string>
+    <string name="screen_colors_title">Rənglər</string>
+    <string name="mdnie_scenario_title_head">Ekran rejimi</string>
+    <string name="mdnie_scenario_summary_head">mDNle ssenarisini tənzimlə</string>
+    <string name="mdnie_accessibility_title_head">Əlçatımlılıq rejimi</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe əlçatımlılıq rejimini tənzimlə</string>
+    <string name="mdnie_scenario_ui">LineageOS (ilkin)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video - isti</string>
+    <string name="mdnie_scenario_video_cold">Video - soyuq</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Hərəkət</string>
+    <string name="mdnie_scenario_gallery">Qalereya</string>
+    <string name="mdnie_scenario_vt">Görüntülü zəng</string>
+    <string name="mdnie_scenario_browser">Səyyah</string>
+    <string name="mdnie_scenario_ebook">Elektron kitab</string>
+    <string name="mdnie_scenario_email">Elektron poçt</string>
+    <string name="mdnie_scenario_tdmb">Rəqəmsal televizor</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Tərsinə çevrilmiş</string>
+    <string name="mdnie_accessibility_color_blind">Daltonizm</string>
+    <string name="mdnie_accessibility_screen_curtain">Ekran pərdəsi</string>
+    <string name="mdnie_accessibility_grayscale">Boz</string>
+    <string name="mdnie_accessibility_gray_negative">Tərs boz</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-b+sr+Latn/arrays.xml b/AdvancedDisplay/res/values-b+sr+Latn/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-b+sr+Latn/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-be/arrays.xml b/AdvancedDisplay/res/values-be/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-be/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-be/strings.xml b/AdvancedDisplay/res/values-be/strings.xml
index f3aeff062..c2e93f20c 100644
--- a/AdvancedDisplay/res/values-be/strings.xml
+++ b/AdvancedDisplay/res/values-be/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Налады экрана</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Экран</string>
-  <string name="screen_colors_title">Колеры</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Сцэнар</string>
-  <string name="mdnie_scenario_summary_head">Усталёўка сцэнара mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Налады экрана</string>
+    <string name="category_screen_title">Экран</string>
+    <string name="screen_colors_title">Колеры</string>
+    <string name="mdnie_scenario_title_head">Сцэнар</string>
+    <string name="mdnie_scenario_summary_head">Усталёўка сцэнара mDNIe</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-bg/arrays.xml b/AdvancedDisplay/res/values-bg/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-bg/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-bg/strings.xml b/AdvancedDisplay/res/values-bg/strings.xml
index c78543e3b..aec59fafc 100644
--- a/AdvancedDisplay/res/values-bg/strings.xml
+++ b/AdvancedDisplay/res/values-bg/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Настройки на дисплея</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Екран</string>
-  <string name="screen_colors_title">Цветове</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Сценарий</string>
-  <string name="mdnie_scenario_summary_head">Избор на сценария mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Настройки на дисплея</string>
+    <string name="category_screen_title">Екран</string>
+    <string name="screen_colors_title">Цветове</string>
+    <string name="mdnie_scenario_title_head">Сценарий</string>
+    <string name="mdnie_scenario_summary_head">Избор на сценария mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Режим на достъп</string>
+    <string name="mdnie_accessibility_summary_head">Задайте режим на достъп за mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (по подразбиране)</string>
+    <string name="mdnie_scenario_video">Видео</string>
+    <string name="mdnie_scenario_video_warm">Видео топло</string>
+    <string name="mdnie_scenario_video_cold">Видео студено</string>
+    <string name="mdnie_scenario_camera">Камера</string>
+    <string name="mdnie_scenario_navigation">Навигация</string>
+    <string name="mdnie_scenario_gallery">Галерия</string>
+    <string name="mdnie_scenario_vt">Видео разговор</string>
+    <string name="mdnie_scenario_browser">Браузър</string>
+    <string name="mdnie_scenario_ebook">Е-книга</string>
+    <string name="mdnie_scenario_email">Имейл</string>
+    <string name="mdnie_scenario_tdmb">Цифрова телевизия</string>
+    <string name="mdnie_accessibility_normal">Нормален</string>
+    <string name="mdnie_accessibility_inverse">Обърнат</string>
+    <string name="mdnie_accessibility_color_blind">За далтонисти</string>
+    <string name="mdnie_accessibility_screen_curtain">Екранна завеса</string>
+    <string name="mdnie_accessibility_grayscale">Сив</string>
+    <string name="mdnie_accessibility_gray_negative">Обърнат сив</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-bn/arrays.xml b/AdvancedDisplay/res/values-bn/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-bn/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-br-rFR/arrays.xml b/AdvancedDisplay/res/values-br-rFR/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-br-rFR/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-br-rFR/strings.xml b/AdvancedDisplay/res/values-br-rFR/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-br-rFR/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-bs/arrays.xml b/AdvancedDisplay/res/values-bs/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-bs/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-bs/strings.xml b/AdvancedDisplay/res/values-bs/strings.xml
index c155d8901..d0c68b6fa 100644
--- a/AdvancedDisplay/res/values-bs/strings.xml
+++ b/AdvancedDisplay/res/values-bs/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="category_screen_title">Ekran</string>
+    <string name="screen_colors_title">Boje</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ca/arrays.xml b/AdvancedDisplay/res/values-ca/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ca/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ca/strings.xml b/AdvancedDisplay/res/values-ca/strings.xml
index 8f93ce4d5..4a6e355d6 100644
--- a/AdvancedDisplay/res/values-ca/strings.xml
+++ b/AdvancedDisplay/res/values-ca/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Pantalla avançada</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Pantalla</string>
-  <string name="screen_colors_title">Colors</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Escenari</string>
-  <string name="mdnie_scenario_summary_head">Estableix l\'escenari de mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Pantalla avançada</string>
+    <string name="category_screen_title">Pantalla</string>
+    <string name="screen_colors_title">Colors</string>
+    <string name="mdnie_scenario_title_head">Escenari</string>
+    <string name="mdnie_scenario_summary_head">Estableix l\'escenari de mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Mode d\'accessibilitat</string>
+    <string name="mdnie_accessibility_summary_head">Estableix el mode d\'accessibilitat mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (per defecte)</string>
+    <string name="mdnie_scenario_video">Vídeo</string>
+    <string name="mdnie_scenario_video_warm">Vídeo càlid</string>
+    <string name="mdnie_scenario_video_cold">Vídeo fred</string>
+    <string name="mdnie_scenario_camera">Càmera</string>
+    <string name="mdnie_scenario_navigation">Navegació</string>
+    <string name="mdnie_scenario_gallery">Galeria</string>
+    <string name="mdnie_scenario_vt">Vídeotrucada</string>
+    <string name="mdnie_scenario_browser">Navegador</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">Correu</string>
+    <string name="mdnie_scenario_tdmb">Televisió digital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Invertit</string>
+    <string name="mdnie_accessibility_color_blind">Daltònic</string>
+    <string name="mdnie_accessibility_screen_curtain">Cortina de pantalla</string>
+    <string name="mdnie_accessibility_grayscale">Gris</string>
+    <string name="mdnie_accessibility_gray_negative">Gris invertit</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-cs/arrays.xml b/AdvancedDisplay/res/values-cs/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-cs/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-cs/strings.xml b/AdvancedDisplay/res/values-cs/strings.xml
index a06ae4377..93e6b62a4 100644
--- a/AdvancedDisplay/res/values-cs/strings.xml
+++ b/AdvancedDisplay/res/values-cs/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Rozšířené zobrazení</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Obrazovka</string>
-  <string name="screen_colors_title">Barvy</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scénář</string>
-  <string name="mdnie_scenario_summary_head">Nastavit scénář pro mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Rozšířené zobrazení</string>
+    <string name="category_screen_title">Obrazovka</string>
+    <string name="screen_colors_title">Barvy</string>
+    <string name="mdnie_scenario_title_head">Scénář</string>
+    <string name="mdnie_scenario_summary_head">Nastavit scénář pro mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Režim usnadnění</string>
+    <string name="mdnie_accessibility_summary_head">Nastavení režimu usnadnění mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (výchozí)</string>
+    <string name="mdnie_scenario_video">Kamera</string>
+    <string name="mdnie_scenario_video_warm">Režim teplých barev</string>
+    <string name="mdnie_scenario_video_cold">Režim studených barev</string>
+    <string name="mdnie_scenario_camera">Fotoaparát</string>
+    <string name="mdnie_scenario_navigation">Navigace</string>
+    <string name="mdnie_scenario_gallery">Galerie</string>
+    <string name="mdnie_scenario_vt">Video hovor</string>
+    <string name="mdnie_scenario_browser">Prohlížeč</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digitální televize</string>
+    <string name="mdnie_accessibility_normal">Normální</string>
+    <string name="mdnie_accessibility_inverse">Inverzní</string>
+    <string name="mdnie_accessibility_color_blind">Barvoslepost</string>
+    <string name="mdnie_accessibility_screen_curtain">Záclony v obraze</string>
+    <string name="mdnie_accessibility_grayscale">Šedá</string>
+    <string name="mdnie_accessibility_gray_negative">Invertovaná šedá</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-csb/arrays.xml b/AdvancedDisplay/res/values-csb/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-csb/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-csb/strings.xml b/AdvancedDisplay/res/values-csb/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-csb/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-cy/arrays.xml b/AdvancedDisplay/res/values-cy/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-cy/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-cy/strings.xml b/AdvancedDisplay/res/values-cy/strings.xml
index c155d8901..3e181b218 100644
--- a/AdvancedDisplay/res/values-cy/strings.xml
+++ b/AdvancedDisplay/res/values-cy/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Dangosydd uwch</string>
+    <string name="category_screen_title">Sgrin</string>
+    <string name="screen_colors_title">Lliwiau</string>
+    <string name="mdnie_scenario_title_head">Senario</string>
+    <string name="mdnie_scenario_summary_head">Gosod y senario mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modd hygyrchedd</string>
+    <string name="mdnie_accessibility_summary_head">Gosod modd hygyrchedd mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (rhagosodiad)</string>
+    <string name="mdnie_scenario_video">Fideo</string>
+    <string name="mdnie_scenario_video_warm">Fideo cynnes</string>
+    <string name="mdnie_scenario_video_cold">Fideo oer</string>
+    <string name="mdnie_scenario_camera">Camera</string>
+    <string name="mdnie_scenario_navigation">Llywio</string>
+    <string name="mdnie_scenario_gallery">Oriel</string>
+    <string name="mdnie_scenario_vt">Galwad fideo</string>
+    <string name="mdnie_scenario_browser">Porwr</string>
+    <string name="mdnie_scenario_ebook">eLyfr</string>
+    <string name="mdnie_scenario_email">Ebost</string>
+    <string name="mdnie_scenario_tdmb">Teledu digidol</string>
+    <string name="mdnie_accessibility_normal">Arferol</string>
+    <string name="mdnie_accessibility_inverse">Wedi\'i wrthdroi</string>
+    <string name="mdnie_accessibility_color_blind">Lliwddall</string>
+    <string name="mdnie_accessibility_screen_curtain">Screen curtain (Rhybudd: Peryg. Paid â\'i ddewis.) </string>
+    <string name="mdnie_accessibility_grayscale">Llwyd</string>
+    <string name="mdnie_accessibility_gray_negative">Llwyd wedi\'i wrthdroi</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-da/arrays.xml b/AdvancedDisplay/res/values-da/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-da/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-da/strings.xml b/AdvancedDisplay/res/values-da/strings.xml
index c719e8681..0a47a6de6 100644
--- a/AdvancedDisplay/res/values-da/strings.xml
+++ b/AdvancedDisplay/res/values-da/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Avancerede skærmindstillinger</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Skærm</string>
-  <string name="screen_colors_title">Farver</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenarie</string>
-  <string name="mdnie_scenario_summary_head">Angiv mDNIe-scenariet</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Avanceret display</string>
+    <string name="category_screen_title">Skærm</string>
+    <string name="screen_colors_title">Farver</string>
+    <string name="mdnie_scenario_title_head">Scenarie</string>
+    <string name="mdnie_scenario_summary_head">Angiv mDNIe-scenariet</string>
+    <string name="mdnie_scenario_ui">LineageOS (standard)</string>
+    <string name="mdnie_scenario_vt">Videoopkald</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-de/arrays.xml b/AdvancedDisplay/res/values-de/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-de/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-de/strings.xml b/AdvancedDisplay/res/values-de/strings.xml
index 198f4aff3..5cd39a779 100644
--- a/AdvancedDisplay/res/values-de/strings.xml
+++ b/AdvancedDisplay/res/values-de/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Erweiterte Anzeige-Einstellungen</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Bildschirm</string>
-  <string name="screen_colors_title">Farben</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Szenario</string>
-  <string name="mdnie_scenario_summary_head">Wählen Sie das mDNIe-Szenario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Erweiterte Anzeige-Einstellungen</string>
+    <string name="category_screen_title">Bildschirm</string>
+    <string name="screen_colors_title">Farben</string>
+    <string name="mdnie_scenario_title_head">Szenario</string>
+    <string name="mdnie_scenario_summary_head">Wähle das mDNIe-Szenario</string>
+    <string name="mdnie_accessibility_title_head">Barrierefreier Modus</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe-Modus festlegen</string>
+    <string name="mdnie_scenario_ui">LineageOS (Standard)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Videomodus (warm)</string>
+    <string name="mdnie_scenario_video_cold">Videomodus (kalt)</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Navigation</string>
+    <string name="mdnie_scenario_gallery">Galerie</string>
+    <string name="mdnie_scenario_vt">Videoanruf</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">E-Book</string>
+    <string name="mdnie_scenario_email">E-Mail</string>
+    <string name="mdnie_scenario_tdmb">Digitales Fernsehen</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Invertiert</string>
+    <string name="mdnie_accessibility_color_blind">Farbenblind</string>
+    <string name="mdnie_accessibility_screen_curtain">Bildschirmvorhang</string>
+    <string name="mdnie_accessibility_grayscale">Grau</string>
+    <string name="mdnie_accessibility_gray_negative">Grau invertiert</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-el/arrays.xml b/AdvancedDisplay/res/values-el/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-el/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-el/strings.xml b/AdvancedDisplay/res/values-el/strings.xml
index 7531c40cc..2f77c48d7 100644
--- a/AdvancedDisplay/res/values-el/strings.xml
+++ b/AdvancedDisplay/res/values-el/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Ρυθμίσεις οθόνης για προχωρημένους</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Οθόνη</string>
-  <string name="screen_colors_title">Χρώματα</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Σενάριο</string>
-  <string name="mdnie_scenario_summary_head">Ορίστε το σενάριο mDNIe</string>
-  <string name="mdnie_accessibility_title_head">Λειτουργία προσβασιμότητας</string>
-  <string name="mdnie_accessibility_summary_head">Ορίστε τη λειτουργία προσβασιμότητας mDNIe</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (προεπιλογή)</string>
-  <string name="mdnie_scenario_video">Βίντεο</string>
-  <string name="mdnie_scenario_video_warm">Θερμό βίντεο</string>
-  <string name="mdnie_scenario_video_cold">Ψυχρό βίντεο</string>
-  <string name="mdnie_scenario_camera">Φωτογραφική μηχανή</string>
-  <string name="mdnie_scenario_navigation">Πλοήγηση</string>
-  <string name="mdnie_scenario_gallery">Συλλογή</string>
-  <string name="mdnie_scenario_vt">Βιντεοκλήση</string>
-  <string name="mdnie_scenario_browser">Περιηγητής</string>
-  <string name="mdnie_scenario_ebook">eBook</string>
-  <string name="mdnie_scenario_email">E-mail</string>
-  <string name="mdnie_scenario_tdmb">Ψηφιακή τηλεόραση</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">Κανονική</string>
-  <string name="mdnie_accessibility_inverse">Ανεστραμμένη</string>
-  <string name="mdnie_accessibility_color_blind">Αχρωματοψία</string>
-  <string name="mdnie_accessibility_screen_curtain">Κουρτίνα οθόνης</string>
-  <string name="mdnie_accessibility_grayscale">Γκρί</string>
-  <string name="mdnie_accessibility_gray_negative">Γκρι ανεστραμμένη</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Ρυθμίσεις οθόνης για προχωρημένους</string>
+    <string name="category_screen_title">Οθόνη</string>
+    <string name="screen_colors_title">Χρώματα</string>
+    <string name="mdnie_scenario_title_head">Σενάριο</string>
+    <string name="mdnie_scenario_summary_head">Ορίστε το σενάριο mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Λειτουργία προσβασιμότητας</string>
+    <string name="mdnie_accessibility_summary_head">Ορίστε τη λειτουργία προσβασιμότητας mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (προεπιλογή)</string>
+    <string name="mdnie_scenario_video">Βίντεο</string>
+    <string name="mdnie_scenario_video_warm">Θερμό βίντεο</string>
+    <string name="mdnie_scenario_video_cold">Ψυχρό βίντεο</string>
+    <string name="mdnie_scenario_camera">Φωτογραφική μηχανή</string>
+    <string name="mdnie_scenario_navigation">Πλοήγηση</string>
+    <string name="mdnie_scenario_gallery">Συλλογή</string>
+    <string name="mdnie_scenario_vt">Βιντεοκλήση</string>
+    <string name="mdnie_scenario_browser">Περιηγητής</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Ψηφιακή τηλεόραση</string>
+    <string name="mdnie_accessibility_normal">Κανονική</string>
+    <string name="mdnie_accessibility_inverse">Ανεστραμμένη</string>
+    <string name="mdnie_accessibility_color_blind">Αχρωματοψία</string>
+    <string name="mdnie_accessibility_screen_curtain">Κουρτίνα οθόνης</string>
+    <string name="mdnie_accessibility_grayscale">Γκρί</string>
+    <string name="mdnie_accessibility_gray_negative">Γκρι ανεστραμμένη</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-en-rAU/arrays.xml b/AdvancedDisplay/res/values-en-rAU/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-en-rAU/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-en-rAU/strings.xml b/AdvancedDisplay/res/values-en-rAU/strings.xml
index 793dcf669..2c0f179ad 100644
--- a/AdvancedDisplay/res/values-en-rAU/strings.xml
+++ b/AdvancedDisplay/res/values-en-rAU/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Advanced display</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Screen</string>
-  <string name="screen_colors_title">Colours</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Advanced display</string>
+    <string name="category_screen_title">Screen</string>
+    <string name="screen_colors_title">Colours</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
+    <string name="mdnie_accessibility_title_head">Accessibility mode</string>
+    <string name="mdnie_accessibility_summary_head">Set the mDNIe accessibility mode</string>
+    <string name="mdnie_scenario_ui">LineageOS (default)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video warm</string>
+    <string name="mdnie_scenario_video_cold">Video cold</string>
+    <string name="mdnie_scenario_camera">Camera</string>
+    <string name="mdnie_scenario_navigation">Navigation</string>
+    <string name="mdnie_scenario_gallery">Gallery</string>
+    <string name="mdnie_scenario_vt">Video call</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digital television</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Inverted</string>
+    <string name="mdnie_accessibility_color_blind">Colour blind</string>
+    <string name="mdnie_accessibility_screen_curtain">Screen curtain</string>
+    <string name="mdnie_accessibility_grayscale">Grey</string>
+    <string name="mdnie_accessibility_gray_negative">Grey inverted</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-en-rCA/arrays.xml b/AdvancedDisplay/res/values-en-rCA/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-en-rCA/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-en-rCA/strings.xml b/AdvancedDisplay/res/values-en-rCA/strings.xml
index c155d8901..512ed4b12 100644
--- a/AdvancedDisplay/res/values-en-rCA/strings.xml
+++ b/AdvancedDisplay/res/values-en-rCA/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Advanced display</string>
+    <string name="category_screen_title">Screen</string>
+    <string name="screen_colors_title">Colours</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
+    <string name="mdnie_accessibility_title_head">Accessibility mode</string>
+    <string name="mdnie_accessibility_summary_head">Set the mDNIe accessibility mode</string>
+    <string name="mdnie_scenario_ui">LineageOS (default)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video warm</string>
+    <string name="mdnie_scenario_video_cold">Video cold</string>
+    <string name="mdnie_scenario_camera">Camera</string>
+    <string name="mdnie_scenario_navigation">Navigation</string>
+    <string name="mdnie_scenario_gallery">Gallery</string>
+    <string name="mdnie_scenario_vt">Video call</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digital television</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Inverted</string>
+    <string name="mdnie_accessibility_color_blind">Colour blind</string>
+    <string name="mdnie_accessibility_screen_curtain">Screen curtain</string>
+    <string name="mdnie_accessibility_grayscale">Gray</string>
+    <string name="mdnie_accessibility_gray_negative">Gray inverted</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-en-rGB/arrays.xml b/AdvancedDisplay/res/values-en-rGB/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-en-rGB/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-en-rGB/strings.xml b/AdvancedDisplay/res/values-en-rGB/strings.xml
index 793dcf669..2c0f179ad 100644
--- a/AdvancedDisplay/res/values-en-rGB/strings.xml
+++ b/AdvancedDisplay/res/values-en-rGB/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Advanced display</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Screen</string>
-  <string name="screen_colors_title">Colours</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Advanced display</string>
+    <string name="category_screen_title">Screen</string>
+    <string name="screen_colors_title">Colours</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
+    <string name="mdnie_accessibility_title_head">Accessibility mode</string>
+    <string name="mdnie_accessibility_summary_head">Set the mDNIe accessibility mode</string>
+    <string name="mdnie_scenario_ui">LineageOS (default)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video warm</string>
+    <string name="mdnie_scenario_video_cold">Video cold</string>
+    <string name="mdnie_scenario_camera">Camera</string>
+    <string name="mdnie_scenario_navigation">Navigation</string>
+    <string name="mdnie_scenario_gallery">Gallery</string>
+    <string name="mdnie_scenario_vt">Video call</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digital television</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Inverted</string>
+    <string name="mdnie_accessibility_color_blind">Colour blind</string>
+    <string name="mdnie_accessibility_screen_curtain">Screen curtain</string>
+    <string name="mdnie_accessibility_grayscale">Grey</string>
+    <string name="mdnie_accessibility_gray_negative">Grey inverted</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-en-rIN/arrays.xml b/AdvancedDisplay/res/values-en-rIN/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-en-rIN/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-en-rIN/strings.xml b/AdvancedDisplay/res/values-en-rIN/strings.xml
index 793dcf669..2c0f179ad 100644
--- a/AdvancedDisplay/res/values-en-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-en-rIN/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Advanced display</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Screen</string>
-  <string name="screen_colors_title">Colours</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Advanced display</string>
+    <string name="category_screen_title">Screen</string>
+    <string name="screen_colors_title">Colours</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
+    <string name="mdnie_accessibility_title_head">Accessibility mode</string>
+    <string name="mdnie_accessibility_summary_head">Set the mDNIe accessibility mode</string>
+    <string name="mdnie_scenario_ui">LineageOS (default)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video warm</string>
+    <string name="mdnie_scenario_video_cold">Video cold</string>
+    <string name="mdnie_scenario_camera">Camera</string>
+    <string name="mdnie_scenario_navigation">Navigation</string>
+    <string name="mdnie_scenario_gallery">Gallery</string>
+    <string name="mdnie_scenario_vt">Video call</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digital television</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Inverted</string>
+    <string name="mdnie_accessibility_color_blind">Colour blind</string>
+    <string name="mdnie_accessibility_screen_curtain">Screen curtain</string>
+    <string name="mdnie_accessibility_grayscale">Grey</string>
+    <string name="mdnie_accessibility_gray_negative">Grey inverted</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-en-rPT/arrays.xml b/AdvancedDisplay/res/values-en-rPT/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-en-rPT/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-en-rPT/strings.xml b/AdvancedDisplay/res/values-en-rPT/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-en-rPT/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-eo/arrays.xml b/AdvancedDisplay/res/values-eo/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-eo/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-eo/strings.xml b/AdvancedDisplay/res/values-eo/strings.xml
index 22d9418a0..5f4b92823 100644
--- a/AdvancedDisplay/res/values-eo/strings.xml
+++ b/AdvancedDisplay/res/values-eo/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,10 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <string name="screen_colors_title">Koloroj</string>
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="screen_colors_title">Koloroj</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-es-rCO/arrays.xml b/AdvancedDisplay/res/values-es-rCO/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-es-rCO/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-es-rCO/strings.xml b/AdvancedDisplay/res/values-es-rCO/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-es-rCO/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-es-rMX/arrays.xml b/AdvancedDisplay/res/values-es-rMX/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-es-rMX/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-es-rMX/strings.xml b/AdvancedDisplay/res/values-es-rMX/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-es-rUS/arrays.xml b/AdvancedDisplay/res/values-es-rUS/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-es-rUS/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-es-rUS/strings.xml b/AdvancedDisplay/res/values-es-rUS/strings.xml
index 7048fcb51..1caa3172e 100644
--- a/AdvancedDisplay/res/values-es-rUS/strings.xml
+++ b/AdvancedDisplay/res/values-es-rUS/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Ajustes avanzados</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Pantalla</string>
-  <string name="screen_colors_title">Colores</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Escenario</string>
-  <string name="mdnie_scenario_summary_head">Establecer escenario mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Ajustes avanzados</string>
+    <string name="category_screen_title">Pantalla</string>
+    <string name="screen_colors_title">Colores</string>
+    <string name="mdnie_scenario_title_head">Escenario</string>
+    <string name="mdnie_scenario_summary_head">Establecer escenario mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modo de accesibilidad</string>
+    <string name="mdnie_accessibility_summary_head">Establecer el modo de accesibilidad mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (predefinido)</string>
+    <string name="mdnie_scenario_video">Vídeo</string>
+    <string name="mdnie_scenario_video_warm">Vídeo cálido</string>
+    <string name="mdnie_scenario_video_cold">Vídeo frío</string>
+    <string name="mdnie_scenario_camera">Cámara</string>
+    <string name="mdnie_scenario_navigation">Navegación</string>
+    <string name="mdnie_scenario_gallery">Galería</string>
+    <string name="mdnie_scenario_vt">Videollamada</string>
+    <string name="mdnie_scenario_browser">Navegador</string>
+    <string name="mdnie_scenario_ebook">Libro digital</string>
+    <string name="mdnie_scenario_email">Correo electrónico</string>
+    <string name="mdnie_scenario_tdmb">Televisión digital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Invertido</string>
+    <string name="mdnie_accessibility_color_blind">Daltónico</string>
+    <string name="mdnie_accessibility_screen_curtain">Cortina de pantalla</string>
+    <string name="mdnie_accessibility_grayscale">Gris</string>
+    <string name="mdnie_accessibility_gray_negative">Gris invertido</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-es/arrays.xml b/AdvancedDisplay/res/values-es/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-es/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-es/strings.xml b/AdvancedDisplay/res/values-es/strings.xml
index c7c4ff58b..453f8ad66 100644
--- a/AdvancedDisplay/res/values-es/strings.xml
+++ b/AdvancedDisplay/res/values-es/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,22 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Pantalla avanzada</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Pantalla</string>
-  <string name="screen_colors_title">Colores</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Escenario</string>
-  <string name="mdnie_scenario_summary_head">Establecer el escenario mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Pantalla avanzada</string>
+    <string name="category_screen_title">Pantalla</string>
+    <string name="screen_colors_title">Colores</string>
+    <string name="mdnie_scenario_title_head">Escenario</string>
+    <string name="mdnie_scenario_summary_head">Establecer el escenario mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modo de accesibilidad</string>
+    <string name="mdnie_accessibility_summary_head">Definir el modo de accesibilidad mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (predefinido)</string>
+    <string name="mdnie_scenario_video">Vídeo</string>
+    <string name="mdnie_scenario_video_warm">Vídeo cálido</string>
+    <string name="mdnie_scenario_video_cold">Vídeo frío</string>
+    <string name="mdnie_scenario_camera">Cámara</string>
+    <string name="mdnie_scenario_navigation">Navegación</string>
+    <string name="mdnie_scenario_gallery">Galería</string>
+    <string name="mdnie_scenario_vt">Videollamada</string>
+    <string name="mdnie_scenario_browser">Navegador</string>
+    <string name="mdnie_scenario_ebook">Libro electrónico</string>
+    <string name="mdnie_accessibility_screen_curtain">Cortina de pantalla</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-et/arrays.xml b/AdvancedDisplay/res/values-et/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-et/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-et/strings.xml b/AdvancedDisplay/res/values-et/strings.xml
index d862e108e..1b468ed99 100644
--- a/AdvancedDisplay/res/values-et/strings.xml
+++ b/AdvancedDisplay/res/values-et/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Täpsem displei</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ekraan</string>
-  <string name="screen_colors_title">Värvid</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Stsenaarium</string>
-  <string name="mdnie_scenario_summary_head">Seadke mDNIe stsenaarium</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Täpsem displei</string>
+    <string name="category_screen_title">Ekraan</string>
+    <string name="screen_colors_title">Värvid</string>
+    <string name="mdnie_scenario_title_head">Stsenaarium</string>
+    <string name="mdnie_scenario_summary_head">Seadke mDNIe stsenaarium</string>
+    <string name="mdnie_accessibility_title_head">Juurdepääsetavusrežiim</string>
+    <string name="mdnie_accessibility_summary_head">Määra mDNIe juurdepääsetavusrežiim</string>
+    <string name="mdnie_scenario_ui">LineageOS (vaikimisi)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video soe</string>
+    <string name="mdnie_scenario_video_cold">Video külm</string>
+    <string name="mdnie_scenario_camera">Kaamera</string>
+    <string name="mdnie_scenario_navigation">Navigeerimine</string>
+    <string name="mdnie_scenario_gallery">Galerii</string>
+    <string name="mdnie_scenario_vt">Videokõne</string>
+    <string name="mdnie_scenario_browser">Veebilehitseja</string>
+    <string name="mdnie_scenario_ebook">E-raamat</string>
+    <string name="mdnie_scenario_email">E-post</string>
+    <string name="mdnie_scenario_tdmb">Digitaalne televisioon</string>
+    <string name="mdnie_accessibility_normal">Tavaline</string>
+    <string name="mdnie_accessibility_inverse">Pööratud</string>
+    <string name="mdnie_accessibility_color_blind">Värvipimedatele</string>
+    <string name="mdnie_accessibility_screen_curtain">Ekraanikardin</string>
+    <string name="mdnie_accessibility_grayscale">Hall</string>
+    <string name="mdnie_accessibility_gray_negative">Pööratud hall</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-eu/arrays.xml b/AdvancedDisplay/res/values-eu/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-eu/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-eu/strings.xml b/AdvancedDisplay/res/values-eu/strings.xml
index 8715aff26..16da2eba3 100644
--- a/AdvancedDisplay/res/values-eu/strings.xml
+++ b/AdvancedDisplay/res/values-eu/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Pantaila aurreratua</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Pantaila</string>
-  <string name="screen_colors_title">Koloreak</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Eszenatokia</string>
-  <string name="mdnie_scenario_summary_head">mDNIe eszenatokia ezarri</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Pantaila aurreratua</string>
+    <string name="category_screen_title">Pantaila</string>
+    <string name="screen_colors_title">Koloreak</string>
+    <string name="mdnie_scenario_title_head">Eszenatokia</string>
+    <string name="mdnie_scenario_summary_head">mDNIe eszenatokia ezarri</string>
+    <string name="mdnie_accessibility_title_head">Irisgarritasun modua</string>
+    <string name="mdnie_accessibility_summary_head">Ezarri mDNIe irisgarritasun modua</string>
+    <string name="mdnie_scenario_ui">LineageOS (lehenetsia)</string>
+    <string name="mdnie_scenario_video">Bideoa</string>
+    <string name="mdnie_scenario_video_warm">Bideo epela</string>
+    <string name="mdnie_scenario_video_cold">Bideo hotza</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Nabigazioa</string>
+    <string name="mdnie_scenario_gallery">Galeria</string>
+    <string name="mdnie_scenario_vt">Bideo-deia</string>
+    <string name="mdnie_scenario_browser">Nabigatzailea</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Telebista digitala</string>
+    <string name="mdnie_accessibility_normal">Arrunta</string>
+    <string name="mdnie_accessibility_inverse">Alderantzikatua</string>
+    <string name="mdnie_accessibility_color_blind">Kolore-itsua</string>
+    <string name="mdnie_accessibility_screen_curtain">Pantaila gortina</string>
+    <string name="mdnie_accessibility_grayscale">Grisa</string>
+    <string name="mdnie_accessibility_gray_negative">Grisa alderantzikatua</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-fa/arrays.xml b/AdvancedDisplay/res/values-fa/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-fa/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-fa/strings.xml b/AdvancedDisplay/res/values-fa/strings.xml
index 3964b7653..215e556c4 100644
--- a/AdvancedDisplay/res/values-fa/strings.xml
+++ b/AdvancedDisplay/res/values-fa/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">نمایش پیشرفته</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">صفحه نمایش</string>
-  <string name="screen_colors_title">رنگ‌ها</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">خط مشی</string>
-  <string name="mdnie_scenario_summary_head">تنظیم خط مشی mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">نمایش پیشرفته</string>
+    <string name="category_screen_title">صفحه نمایش</string>
+    <string name="screen_colors_title">رنگ‌ها</string>
+    <string name="mdnie_scenario_title_head">خط مشی</string>
+    <string name="mdnie_scenario_summary_head">تنظیم خط مشی mDNIe</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-fi/arrays.xml b/AdvancedDisplay/res/values-fi/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-fi/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-fi/strings.xml b/AdvancedDisplay/res/values-fi/strings.xml
index d9de8cdfd..ebaf4cf74 100644
--- a/AdvancedDisplay/res/values-fi/strings.xml
+++ b/AdvancedDisplay/res/values-fi/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Näytön lisäasetukset</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Näyttö</string>
-  <string name="screen_colors_title">Värit</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Skenaario</string>
-  <string name="mdnie_scenario_summary_head">Aseta mDNIe-skenaario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Näytön lisäasetukset</string>
+    <string name="category_screen_title">Näyttö</string>
+    <string name="screen_colors_title">Värit</string>
+    <string name="mdnie_scenario_title_head">Skenaario</string>
+    <string name="mdnie_scenario_summary_head">Aseta mDNIe-skenaario</string>
+    <string name="mdnie_accessibility_title_head">Helppokäyttötila</string>
+    <string name="mdnie_accessibility_summary_head">Aseta mDNIe-tila</string>
+    <string name="mdnie_scenario_ui">LineageOS (oletus)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video (lämmin)</string>
+    <string name="mdnie_scenario_video_cold">Video (kylmä)</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Navigointi</string>
+    <string name="mdnie_scenario_gallery">Galleria</string>
+    <string name="mdnie_scenario_vt">Videopuhelu</string>
+    <string name="mdnie_scenario_browser">Selain</string>
+    <string name="mdnie_scenario_ebook">E-kirja</string>
+    <string name="mdnie_scenario_email">Sähköposti</string>
+    <string name="mdnie_scenario_tdmb">Digitaalinen televisio</string>
+    <string name="mdnie_accessibility_normal">Normaali</string>
+    <string name="mdnie_accessibility_inverse">Käänteinen</string>
+    <string name="mdnie_accessibility_color_blind">Värisokea</string>
+    <string name="mdnie_accessibility_screen_curtain">Näyttöverho</string>
+    <string name="mdnie_accessibility_grayscale">Harmaa</string>
+    <string name="mdnie_accessibility_gray_negative">Harmaa (käänteinen)</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-fil/arrays.xml b/AdvancedDisplay/res/values-fil/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-fil/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-fil/strings.xml b/AdvancedDisplay/res/values-fil/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-fil/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-fr-rCA/arrays.xml b/AdvancedDisplay/res/values-fr-rCA/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-fr-rCA/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-fr-rCA/strings.xml b/AdvancedDisplay/res/values-fr-rCA/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-fr/arrays.xml b/AdvancedDisplay/res/values-fr/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-fr/strings.xml b/AdvancedDisplay/res/values-fr/strings.xml
index e1eb24969..a3d03f1c6 100644
--- a/AdvancedDisplay/res/values-fr/strings.xml
+++ b/AdvancedDisplay/res/values-fr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Affichage avancé</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Écran</string>
-  <string name="screen_colors_title">Couleurs</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scénario</string>
-  <string name="mdnie_scenario_summary_head">Définir le scénario mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Affichage avancé</string>
+    <string name="category_screen_title">Écran</string>
+    <string name="screen_colors_title">Couleurs</string>
+    <string name="mdnie_scenario_title_head">Scénario</string>
+    <string name="mdnie_scenario_summary_head">Définir le scénario mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Mode d\'accessibilité</string>
+    <string name="mdnie_accessibility_summary_head">Définir le mode d\'accessibilité mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (par défaut)</string>
+    <string name="mdnie_scenario_video">Vidéo</string>
+    <string name="mdnie_scenario_video_warm">Vidéo chaude</string>
+    <string name="mdnie_scenario_video_cold">Vidéo froide</string>
+    <string name="mdnie_scenario_camera">Appareil photo</string>
+    <string name="mdnie_scenario_navigation">Navigation</string>
+    <string name="mdnie_scenario_gallery">Galerie</string>
+    <string name="mdnie_scenario_vt">Appel vidéo</string>
+    <string name="mdnie_scenario_browser">Navigateur</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Télévision numérique</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Inversé</string>
+    <string name="mdnie_accessibility_color_blind">Daltonien</string>
+    <string name="mdnie_accessibility_screen_curtain">Rideau d\'écran</string>
+    <string name="mdnie_accessibility_grayscale">Gris</string>
+    <string name="mdnie_accessibility_gray_negative">Gris inversé</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-frp/arrays.xml b/AdvancedDisplay/res/values-frp/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-frp/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-frp/strings.xml b/AdvancedDisplay/res/values-frp/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-frp/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-fy-rNL/arrays.xml b/AdvancedDisplay/res/values-fy-rNL/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-fy-rNL/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-fy-rNL/strings.xml b/AdvancedDisplay/res/values-fy-rNL/strings.xml
index c155d8901..bc5e19af7 100644
--- a/AdvancedDisplay/res/values-fy-rNL/strings.xml
+++ b/AdvancedDisplay/res/values-fy-rNL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Avansearre ynstellingen</string>
+    <string name="category_screen_title">Skerm</string>
+    <string name="screen_colors_title">Kleuren</string>
+    <string name="mdnie_scenario_title_head">Senario</string>
+    <string name="mdnie_scenario_summary_head">mDNIe-senario ynstelle</string>
+    <string name="mdnie_accessibility_title_head">Tagonklikheidsmodus</string>
+    <string name="mdnie_accessibility_summary_head">Stel de mDNIe-tagonklikheidsmodus yn</string>
+    <string name="mdnie_scenario_ui">LineageOS (standert)</string>
+    <string name="mdnie_scenario_video">Fideo</string>
+    <string name="mdnie_scenario_video_warm">Fideo (waarm)</string>
+    <string name="mdnie_scenario_video_cold">Fideo (kâld)</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Navigaasje</string>
+    <string name="mdnie_scenario_gallery">Galery</string>
+    <string name="mdnie_scenario_vt">Fideobelle</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digitale televyzje</string>
+    <string name="mdnie_accessibility_normal">Normaal</string>
+    <string name="mdnie_accessibility_inverse">Omkeard</string>
+    <string name="mdnie_accessibility_color_blind">Kleureblyn</string>
+    <string name="mdnie_accessibility_screen_curtain">Skermgerdyn</string>
+    <string name="mdnie_accessibility_grayscale">Griis</string>
+    <string name="mdnie_accessibility_gray_negative">Griis (omkeard)</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ga-rIE/arrays.xml b/AdvancedDisplay/res/values-ga-rIE/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ga-rIE/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ga-rIE/strings.xml b/AdvancedDisplay/res/values-ga-rIE/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-ga-rIE/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-gd/arrays.xml b/AdvancedDisplay/res/values-gd/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-gd/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-gd/strings.xml b/AdvancedDisplay/res/values-gd/strings.xml
index c155d8901..807f0ac2f 100644
--- a/AdvancedDisplay/res/values-gd/strings.xml
+++ b/AdvancedDisplay/res/values-gd/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Taisbeanadh adhartach</string>
+    <string name="category_screen_title">Sgrìn</string>
+    <string name="screen_colors_title">Dathan</string>
+    <string name="mdnie_scenario_title_head">Cnàmh-sgeul</string>
+    <string name="mdnie_scenario_summary_head">Suidhich cnàmh-sgeul mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modh na so-ruigsinneachd</string>
+    <string name="mdnie_accessibility_summary_head">Suidhich modh so-inntrigeachd mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (bun-roghainn)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video blàth</string>
+    <string name="mdnie_scenario_video_cold">Video fuar</string>
+    <string name="mdnie_scenario_camera">Camara</string>
+    <string name="mdnie_scenario_navigation">Seòladaireachd</string>
+    <string name="mdnie_scenario_gallery">Gailearaidh</string>
+    <string name="mdnie_scenario_vt">Gairm video</string>
+    <string name="mdnie_scenario_browser">Brabhsair</string>
+    <string name="mdnie_scenario_ebook">Leabhar-d</string>
+    <string name="mdnie_scenario_email">Post-d</string>
+    <string name="mdnie_scenario_tdmb">Telebhisean digiteach</string>
+    <string name="mdnie_accessibility_normal">Àbhaisteach</string>
+    <string name="mdnie_accessibility_inverse">Ais-thionndaichte</string>
+    <string name="mdnie_accessibility_color_blind">Dath-dhoille</string>
+    <string name="mdnie_accessibility_screen_curtain">Cùirtear sgrìn</string>
+    <string name="mdnie_accessibility_grayscale">Liath</string>
+    <string name="mdnie_accessibility_gray_negative">Liath ais-thionndaichte</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-gl/arrays.xml b/AdvancedDisplay/res/values-gl/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-gl/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-gl/strings.xml b/AdvancedDisplay/res/values-gl/strings.xml
index 2a97a208a..6f18d61f1 100644
--- a/AdvancedDisplay/res/values-gl/strings.xml
+++ b/AdvancedDisplay/res/values-gl/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Visualización avanzada</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Pantalla</string>
-  <string name="screen_colors_title">Cores</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Escenario</string>
-  <string name="mdnie_scenario_summary_head">Estabelecer o escenario mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Visualización avanzada</string>
+    <string name="category_screen_title">Pantalla</string>
+    <string name="screen_colors_title">Cores</string>
+    <string name="mdnie_scenario_title_head">Escenario</string>
+    <string name="mdnie_scenario_summary_head">Estabelecer o escenario mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modo de accesibilidade</string>
+    <string name="mdnie_accessibility_summary_head">Definir o modo de accesibilidade mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (predefinido)</string>
+    <string name="mdnie_scenario_video">Vídeo</string>
+    <string name="mdnie_scenario_video_warm">Vídeo cálido</string>
+    <string name="mdnie_scenario_video_cold">Vídeo frío</string>
+    <string name="mdnie_scenario_camera">Cámara</string>
+    <string name="mdnie_scenario_navigation">Navegación</string>
+    <string name="mdnie_scenario_gallery">Galería</string>
+    <string name="mdnie_scenario_vt">Videochamada</string>
+    <string name="mdnie_scenario_browser">Navegador</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">Correo electrónico</string>
+    <string name="mdnie_scenario_tdmb">Televisión dixital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Invertido</string>
+    <string name="mdnie_accessibility_color_blind">Daltónico</string>
+    <string name="mdnie_accessibility_screen_curtain">Cortina de pantalla</string>
+    <string name="mdnie_accessibility_grayscale">Gris</string>
+    <string name="mdnie_accessibility_gray_negative">Gris invertido</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-gu/arrays.xml b/AdvancedDisplay/res/values-gu/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-gu/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-gu/strings.xml b/AdvancedDisplay/res/values-gu/strings.xml
index 8e2161b46..32dd47311 100644
--- a/AdvancedDisplay/res/values-gu/strings.xml
+++ b/AdvancedDisplay/res/values-gu/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ઍડવાન્સ્ડ ડિસ્પ્લે</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">સ્ક્રીન</string>
-  <string name="screen_colors_title">રંગો</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">દ્રશ્ય</string>
-  <string name="mdnie_scenario_summary_head">mDNIe દ્રશ્ય સેટ કરો</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">ઍડવાન્સ્ડ ડિસ્પ્લે</string>
+    <string name="category_screen_title">સ્ક્રીન</string>
+    <string name="screen_colors_title">રંગો</string>
+    <string name="mdnie_scenario_title_head">દ્રશ્ય</string>
+    <string name="mdnie_scenario_summary_head">mDNIe દ્રશ્ય સેટ કરો</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-hi/arrays.xml b/AdvancedDisplay/res/values-hi/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-hi/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-hi/strings.xml b/AdvancedDisplay/res/values-hi/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-hr/arrays.xml b/AdvancedDisplay/res/values-hr/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-hr/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-hr/strings.xml b/AdvancedDisplay/res/values-hr/strings.xml
index cd5394df8..a69087fd3 100644
--- a/AdvancedDisplay/res/values-hr/strings.xml
+++ b/AdvancedDisplay/res/values-hr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Napredni zaslon</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Zaslon</string>
-  <string name="screen_colors_title">Boje</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenarij</string>
-  <string name="mdnie_scenario_summary_head">Podesite mDNIe scenarij</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Napredni zaslon</string>
+    <string name="category_screen_title">Zaslon</string>
+    <string name="screen_colors_title">Boje</string>
+    <string name="mdnie_scenario_title_head">Scenarij</string>
+    <string name="mdnie_scenario_summary_head">Podesite mDNIe scenarij</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-hu/arrays.xml b/AdvancedDisplay/res/values-hu/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-hu/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-hu/strings.xml b/AdvancedDisplay/res/values-hu/strings.xml
index d2693ac69..c4b5e14d2 100644
--- a/AdvancedDisplay/res/values-hu/strings.xml
+++ b/AdvancedDisplay/res/values-hu/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Speciális kijelző</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Kijelző</string>
-  <string name="screen_colors_title">Színek</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Megjelenítés</string>
-  <string name="mdnie_scenario_summary_head">mDNIe megjelenítési beállítások</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Speciális kijelző</string>
+    <string name="category_screen_title">Kijelző</string>
+    <string name="screen_colors_title">Színek</string>
+    <string name="mdnie_scenario_title_head">Megjelenítés</string>
+    <string name="mdnie_scenario_summary_head">mDNIe megjelenítési beállítások</string>
+    <string name="mdnie_accessibility_title_head">Kisegítőmód</string>
+    <string name="mdnie_accessibility_summary_head">A mDNIe-kisegítőmód beállításai</string>
+    <string name="mdnie_scenario_ui">LineageOS (alapértelmezett)</string>
+    <string name="mdnie_scenario_video">Videó</string>
+    <string name="mdnie_scenario_video_warm">Videó (meleg árnyalat)</string>
+    <string name="mdnie_scenario_video_cold">Videó (hideg árnyalat)</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Navigáció</string>
+    <string name="mdnie_scenario_gallery">Galéria</string>
+    <string name="mdnie_scenario_vt">Videóhívás</string>
+    <string name="mdnie_scenario_browser">Böngésző</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digitális televízió</string>
+    <string name="mdnie_accessibility_normal">Normál</string>
+    <string name="mdnie_accessibility_inverse">Negatív</string>
+    <string name="mdnie_accessibility_color_blind">Színvak</string>
+    <string name="mdnie_accessibility_screen_curtain">Képernyő-függöny</string>
+    <string name="mdnie_accessibility_grayscale">Szürke</string>
+    <string name="mdnie_accessibility_gray_negative">Negatív szürke</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-hy/arrays.xml b/AdvancedDisplay/res/values-hy/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-hy/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-hy/strings.xml b/AdvancedDisplay/res/values-hy/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-hy/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-in/arrays.xml b/AdvancedDisplay/res/values-in/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-in/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-in/strings.xml b/AdvancedDisplay/res/values-in/strings.xml
index c80c8ecb8..855318645 100644
--- a/AdvancedDisplay/res/values-in/strings.xml
+++ b/AdvancedDisplay/res/values-in/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,20 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Tampilan lanjutan</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Layar</string>
-  <string name="screen_colors_title">Warna</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Skenario</string>
-  <string name="mdnie_scenario_summary_head">Setel skenario mDNIe</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (standar)</string>
-  <string name="mdnie_scenario_video">Video</string>
-  <string name="mdnie_scenario_camera">Kamera</string>
-  <string name="mdnie_scenario_navigation">Navigasi</string>
-  <string name="mdnie_scenario_gallery">Galeri</string>
-  <string name="mdnie_scenario_vt">Panggilan video</string>
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Tampilan lanjutan</string>
+    <string name="category_screen_title">Layar</string>
+    <string name="screen_colors_title">Warna</string>
+    <string name="mdnie_scenario_title_head">Skenario</string>
+    <string name="mdnie_scenario_summary_head">Setel skenario mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modus aksesibilitas</string>
+    <string name="mdnie_accessibility_summary_head">Setel modus aksesibilitas mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (standar)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video (warna hangat)</string>
+    <string name="mdnie_scenario_video_cold">Video (warna sejuk)</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Navigasi</string>
+    <string name="mdnie_scenario_gallery">Galeri</string>
+    <string name="mdnie_scenario_vt">Panggilan video</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Televisi digital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Terbalik</string>
+    <string name="mdnie_accessibility_color_blind">Buta warna</string>
+    <string name="mdnie_accessibility_screen_curtain">Tirai layar</string>
+    <string name="mdnie_accessibility_grayscale">Abu-abu</string>
+    <string name="mdnie_accessibility_gray_negative">Abu-abu terbalik</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-is/arrays.xml b/AdvancedDisplay/res/values-is/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-is/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-is/strings.xml b/AdvancedDisplay/res/values-is/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-is/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-it/arrays.xml b/AdvancedDisplay/res/values-it/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-it/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-it/strings.xml b/AdvancedDisplay/res/values-it/strings.xml
index 5f2a87a9f..c6ffc3c6c 100644
--- a/AdvancedDisplay/res/values-it/strings.xml
+++ b/AdvancedDisplay/res/values-it/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Schermo avanzato</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Display</string>
-  <string name="screen_colors_title">Colori</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Imposta scenario mDNle</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Schermo avanzato</string>
+    <string name="category_screen_title">Display</string>
+    <string name="screen_colors_title">Colori</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Imposta scenario mDNle</string>
+    <string name="mdnie_accessibility_title_head">Modalità di accesso facilitato</string>
+    <string name="mdnie_accessibility_summary_head">Imposta la modalità di accesso facilitato mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (predefinito)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Toni caldi</string>
+    <string name="mdnie_scenario_video_cold">Toni freddi</string>
+    <string name="mdnie_scenario_camera">Fotocamera</string>
+    <string name="mdnie_scenario_navigation">Navigazione</string>
+    <string name="mdnie_scenario_gallery">Galleria</string>
+    <string name="mdnie_scenario_vt">Video chiamata</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Televisione digitale</string>
+    <string name="mdnie_accessibility_normal">Normale</string>
+    <string name="mdnie_accessibility_inverse">Invertito</string>
+    <string name="mdnie_accessibility_color_blind">Modalità daltonico</string>
+    <string name="mdnie_accessibility_screen_curtain">Modalità schermo oscurato</string>
+    <string name="mdnie_accessibility_grayscale">Grigio</string>
+    <string name="mdnie_accessibility_gray_negative">Grigio invertito</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-iw/arrays.xml b/AdvancedDisplay/res/values-iw/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-iw/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-iw/strings.xml b/AdvancedDisplay/res/values-iw/strings.xml
index a797dd322..6be7a6dbb 100644
--- a/AdvancedDisplay/res/values-iw/strings.xml
+++ b/AdvancedDisplay/res/values-iw/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">תצוגה מתקדמת</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">מסך</string>
-  <string name="screen_colors_title">צבעים</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">תרחיש</string>
-  <string name="mdnie_scenario_summary_head">הגדר תרחיש mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">תצוגה מתקדמת</string>
+    <string name="category_screen_title">מסך</string>
+    <string name="screen_colors_title">צבעים</string>
+    <string name="mdnie_scenario_title_head">תרחיש</string>
+    <string name="mdnie_scenario_summary_head">הגדר תרחיש mDNIe</string>
+    <string name="mdnie_accessibility_title_head">מצב נגישות</string>
+    <string name="mdnie_scenario_ui">LineageOS (ברירת מחדל)</string>
+    <string name="mdnie_scenario_video">וידאו</string>
+    <string name="mdnie_scenario_video_warm">וידאו חם</string>
+    <string name="mdnie_scenario_video_cold">וידאו קר</string>
+    <string name="mdnie_scenario_camera">מצלמה</string>
+    <string name="mdnie_scenario_navigation">ניווט</string>
+    <string name="mdnie_scenario_gallery">גלריה</string>
+    <string name="mdnie_scenario_vt">שיחת וידאו</string>
+    <string name="mdnie_scenario_browser">דפדפן</string>
+    <string name="mdnie_scenario_ebook">ספר אלקטרוני</string>
+    <string name="mdnie_scenario_email">דוא\"ל</string>
+    <string name="mdnie_scenario_tdmb">טלוויזיה דיגיטלית</string>
+    <string name="mdnie_accessibility_normal">רגיל</string>
+    <string name="mdnie_accessibility_inverse">הפוך</string>
+    <string name="mdnie_accessibility_color_blind">עיוור צבעים</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ja/arrays.xml b/AdvancedDisplay/res/values-ja/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ja/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ja/strings.xml b/AdvancedDisplay/res/values-ja/strings.xml
index ae79b905f..4f23301df 100644
--- a/AdvancedDisplay/res/values-ja/strings.xml
+++ b/AdvancedDisplay/res/values-ja/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ディスプレイの詳細設定</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">画面</string>
-  <string name="screen_colors_title">色</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">シナリオ</string>
-  <string name="mdnie_scenario_summary_head">mDNIeシナリオを設定する</string>
-  <string name="mdnie_accessibility_title_head">アクセシビリティモード</string>
-  <string name="mdnie_accessibility_summary_head">mDNIe アクセシビリティモードを設定します</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS（デフォルト）</string>
-  <string name="mdnie_scenario_video">ビデオ</string>
-  <string name="mdnie_scenario_video_warm">ビデオ（暖色）</string>
-  <string name="mdnie_scenario_video_cold">ビデオ（寒色）</string>
-  <string name="mdnie_scenario_camera">カメラ</string>
-  <string name="mdnie_scenario_navigation">ナビゲーション</string>
-  <string name="mdnie_scenario_gallery">ギャラリー</string>
-  <string name="mdnie_scenario_vt">ビデオ通話</string>
-  <string name="mdnie_scenario_browser">ブラウザー</string>
-  <string name="mdnie_scenario_ebook">電子書籍</string>
-  <string name="mdnie_scenario_email">メール</string>
-  <string name="mdnie_scenario_tdmb">デジタルテレビ</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">標準</string>
-  <string name="mdnie_accessibility_inverse">反転</string>
-  <string name="mdnie_accessibility_color_blind">色覚異常</string>
-  <string name="mdnie_accessibility_screen_curtain">スクリーンカーテン</string>
-  <string name="mdnie_accessibility_grayscale">グレー</string>
-  <string name="mdnie_accessibility_gray_negative">グレー反転</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">ディスプレイの詳細設定</string>
+    <string name="category_screen_title">画面</string>
+    <string name="screen_colors_title">色</string>
+    <string name="mdnie_scenario_title_head">シナリオ</string>
+    <string name="mdnie_scenario_summary_head">mDNIeシナリオを設定する</string>
+    <string name="mdnie_accessibility_title_head">アクセシビリティモード</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe アクセシビリティモードを設定します</string>
+    <string name="mdnie_scenario_ui">LineageOS（デフォルト）</string>
+    <string name="mdnie_scenario_video">ビデオ</string>
+    <string name="mdnie_scenario_video_warm">ビデオ（暖色）</string>
+    <string name="mdnie_scenario_video_cold">ビデオ（寒色）</string>
+    <string name="mdnie_scenario_camera">カメラ</string>
+    <string name="mdnie_scenario_navigation">ナビゲーション</string>
+    <string name="mdnie_scenario_gallery">ギャラリー</string>
+    <string name="mdnie_scenario_vt">ビデオ通話</string>
+    <string name="mdnie_scenario_browser">ブラウザー</string>
+    <string name="mdnie_scenario_ebook">電子書籍</string>
+    <string name="mdnie_scenario_email">メール</string>
+    <string name="mdnie_scenario_tdmb">デジタルテレビ</string>
+    <string name="mdnie_accessibility_normal">標準</string>
+    <string name="mdnie_accessibility_inverse">反転</string>
+    <string name="mdnie_accessibility_color_blind">色覚異常</string>
+    <string name="mdnie_accessibility_screen_curtain">スクリーンカーテン</string>
+    <string name="mdnie_accessibility_grayscale">グレー</string>
+    <string name="mdnie_accessibility_gray_negative">グレー反転</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ka/arrays.xml b/AdvancedDisplay/res/values-ka/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ka/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ka/strings.xml b/AdvancedDisplay/res/values-ka/strings.xml
index c155d8901..d7dd8e005 100644
--- a/AdvancedDisplay/res/values-ka/strings.xml
+++ b/AdvancedDisplay/res/values-ka/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="category_screen_title">ეკრანი</string>
+    <string name="screen_colors_title">ფერები</string>
+    <string name="mdnie_scenario_tdmb">ციფრული ტელევიზია</string>
+    <string name="mdnie_accessibility_grayscale">ნაცრისფერი</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-kab-rDZ/arrays.xml b/AdvancedDisplay/res/values-kab-rDZ/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-kab-rDZ/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-kab-rDZ/strings.xml b/AdvancedDisplay/res/values-kab-rDZ/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-kab-rDZ/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-kk/arrays.xml b/AdvancedDisplay/res/values-kk/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-kk/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-kk/strings.xml b/AdvancedDisplay/res/values-kk/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-kk/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-km/arrays.xml b/AdvancedDisplay/res/values-km/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-km/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-km/strings.xml b/AdvancedDisplay/res/values-km/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-km/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-kn/arrays.xml b/AdvancedDisplay/res/values-kn/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-kn/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-kn/strings.xml b/AdvancedDisplay/res/values-kn/strings.xml
index d171442d4..74d27235f 100644
--- a/AdvancedDisplay/res/values-kn/strings.xml
+++ b/AdvancedDisplay/res/values-kn/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ಸುಧಾರಿತ ಪ್ರದರ್ಶನ</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">ಪರದೆ</string>
-  <string name="screen_colors_title">ಬಣ್ಣಗಳು</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">ಸನ್ನಿವೇಶ</string>
-  <string name="mdnie_scenario_summary_head">mDNIe ಸನ್ನಿವೇಶವನ್ನು ಹೊಂದಿಸಿ</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">ಸುಧಾರಿತ ಪ್ರದರ್ಶನ</string>
+    <string name="category_screen_title">ಪರದೆ</string>
+    <string name="screen_colors_title">ಬಣ್ಣಗಳು</string>
+    <string name="mdnie_scenario_title_head">ಸನ್ನಿವೇಶ</string>
+    <string name="mdnie_scenario_summary_head">mDNIe ಸನ್ನಿವೇಶವನ್ನು ಹೊಂದಿಸಿ</string>
+    <string name="mdnie_accessibility_title_head">ಪ್ರವೇಶಾವಕಾಶ ರೀತಿ</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe ಪ್ರವೇಶ ರೀತಿ ಹೊಂದಿಸು</string>
+    <string name="mdnie_scenario_ui">LineageOS (ಇದ್ದಾಯ್ಕೆ)</string>
+    <string name="mdnie_scenario_video">ದೃಶ್ಯ</string>
+    <string name="mdnie_scenario_video_warm">ಬೆಚ್ಚನೆ ದೃಶ್ಯ</string>
+    <string name="mdnie_scenario_video_cold">ತಣ್ಣನೆ ದೃಶ್ಯ</string>
+    <string name="mdnie_scenario_camera">ತಿಟ್ಟುಕ</string>
+    <string name="mdnie_scenario_navigation">ಸಂಚಾಲನೆ</string>
+    <string name="mdnie_scenario_gallery">ಚಿತ್ರಶಾಲೆ</string>
+    <string name="mdnie_scenario_vt">ದೃಶ್ಯ ಕರೆ</string>
+    <string name="mdnie_scenario_browser">ಬ್ರೌಸರ್</string>
+    <string name="mdnie_scenario_ebook">e-ಪುಸ್ತಕ</string>
+    <string name="mdnie_scenario_email">e-ಅಂಚೆ</string>
+    <string name="mdnie_scenario_tdmb">ಅಂಕೀಯ ದೂರದರ್ಶನ</string>
+    <string name="mdnie_accessibility_normal">ಸಾಧಾರಣ</string>
+    <string name="mdnie_accessibility_inverse">ವ್ಯತಿರಿಕ್ತವಾದ</string>
+    <string name="mdnie_accessibility_color_blind">ಬಣ್ಣ ಕುರುಡು</string>
+    <string name="mdnie_accessibility_screen_curtain">ಪರದೆಯ ತೆರೆ</string>
+    <string name="mdnie_accessibility_grayscale">ಬೂದು</string>
+    <string name="mdnie_accessibility_gray_negative">ವ್ಯತಿರಿಕ್ತವಾದ ಬೂದು</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ko/arrays.xml b/AdvancedDisplay/res/values-ko/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ko/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ko/strings.xml b/AdvancedDisplay/res/values-ko/strings.xml
index e2ec7bce4..03ed88ca4 100644
--- a/AdvancedDisplay/res/values-ko/strings.xml
+++ b/AdvancedDisplay/res/values-ko/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">고급 디스플레이</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">화면</string>
-  <string name="screen_colors_title">색상</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">시나리오</string>
-  <string name="mdnie_scenario_summary_head">mDNIe 시나리오 설정</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">고급 디스플레이</string>
+    <string name="category_screen_title">화면</string>
+    <string name="screen_colors_title">색상</string>
+    <string name="mdnie_scenario_title_head">시나리오</string>
+    <string name="mdnie_scenario_summary_head">mDNIe 시나리오 설정</string>
+    <string name="mdnie_accessibility_title_head">접근성 모드</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe 접근성 모드 설정</string>
+    <string name="mdnie_scenario_ui">LineageOS (기본값)</string>
+    <string name="mdnie_scenario_video">비디오</string>
+    <string name="mdnie_scenario_video_warm">비디오 (따뜻한 색)</string>
+    <string name="mdnie_scenario_video_cold">비디오 (차가운 색)</string>
+    <string name="mdnie_scenario_camera">카메라</string>
+    <string name="mdnie_scenario_navigation">내비게이션</string>
+    <string name="mdnie_scenario_gallery">갤러리</string>
+    <string name="mdnie_scenario_vt">영상 통화</string>
+    <string name="mdnie_scenario_browser">브라우저</string>
+    <string name="mdnie_scenario_ebook">전자책</string>
+    <string name="mdnie_scenario_email">이메일</string>
+    <string name="mdnie_scenario_tdmb">디지털 TV</string>
+    <string name="mdnie_accessibility_normal">기본</string>
+    <string name="mdnie_accessibility_inverse">반전</string>
+    <string name="mdnie_accessibility_color_blind">색맹</string>
+    <string name="mdnie_accessibility_screen_curtain">화면 커튼</string>
+    <string name="mdnie_accessibility_grayscale">흑백</string>
+    <string name="mdnie_accessibility_gray_negative">흑백 반전</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ku/arrays.xml b/AdvancedDisplay/res/values-ku/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ku/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ku/strings.xml b/AdvancedDisplay/res/values-ku/strings.xml
index a957a68d5..3d0488e8c 100644
--- a/AdvancedDisplay/res/values-ku/strings.xml
+++ b/AdvancedDisplay/res/values-ku/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">پیشاندانی پێشکه‌وتوو</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">شاشە</string>
-  <string name="screen_colors_title">ڕه‌نگه‌کان</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">سیناریۆ</string>
-  <string name="mdnie_scenario_summary_head">دانانی دۆخی mDNIe سیناریۆ</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">پیشاندانی پێشکه‌وتوو</string>
+    <string name="category_screen_title">شاشە</string>
+    <string name="screen_colors_title">ڕه‌نگه‌کان</string>
+    <string name="mdnie_scenario_title_head">سیناریۆ</string>
+    <string name="mdnie_scenario_summary_head">دانانی دۆخی mDNIe سیناریۆ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ky/arrays.xml b/AdvancedDisplay/res/values-ky/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ky/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ky/strings.xml b/AdvancedDisplay/res/values-ky/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-ky/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-lb/arrays.xml b/AdvancedDisplay/res/values-lb/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-lb/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-lb/strings.xml b/AdvancedDisplay/res/values-lb/strings.xml
index b7ada6d41..fa3cf99d4 100644
--- a/AdvancedDisplay/res/values-lb/strings.xml
+++ b/AdvancedDisplay/res/values-lb/strings.xml
@@ -17,14 +17,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Erweiderte Schierm</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Schierm</string>
-  <string name="screen_colors_title">Faarwen</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Zeenario</string>
-  <string name="mdnie_scenario_summary_head">mDNIe-Zeenario auswielen</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Erweiderte Schierm</string>
+    <string name="category_screen_title">Schierm</string>
+    <string name="screen_colors_title">Faarwen</string>
+    <string name="mdnie_scenario_title_head">Zeenario</string>
+    <string name="mdnie_scenario_summary_head">mDNIe-Zeenario auswielen</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-lo/arrays.xml b/AdvancedDisplay/res/values-lo/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-lo/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-lo/strings.xml b/AdvancedDisplay/res/values-lo/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-lo/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-lt/arrays.xml b/AdvancedDisplay/res/values-lt/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-lt/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-lt/strings.xml b/AdvancedDisplay/res/values-lt/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-lt/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-b+sr+Latn/strings.xml b/AdvancedDisplay/res/values-lu/strings.xml
similarity index 71%
rename from AdvancedDisplay/res/values-b+sr+Latn/strings.xml
rename to AdvancedDisplay/res/values-lu/strings.xml
index c155d8901..ba89c0bc1 100644
--- a/AdvancedDisplay/res/values-b+sr+Latn/strings.xml
+++ b/AdvancedDisplay/res/values-lu/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Erweiderte Schierm</string>
+    <string name="category_screen_title">Schierm</string>
+    <string name="screen_colors_title">Faarwen</string>
+    <string name="mdnie_scenario_title_head">Zeenario</string>
+    <string name="mdnie_scenario_summary_head">mDNIe-Zeenario auswielen</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-lv/arrays.xml b/AdvancedDisplay/res/values-lv/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-lv/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-lv/strings.xml b/AdvancedDisplay/res/values-lv/strings.xml
index 0a1798f3a..684b5a5c6 100644
--- a/AdvancedDisplay/res/values-lv/strings.xml
+++ b/AdvancedDisplay/res/values-lv/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Papildu displejs</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ekrāns</string>
-  <string name="screen_colors_title">Krāsas</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenārijs</string>
-  <string name="mdnie_scenario_summary_head">Uzstādīt mDNIe scenāriju</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Papildu displejs</string>
+    <string name="category_screen_title">Ekrāns</string>
+    <string name="screen_colors_title">Krāsas</string>
+    <string name="mdnie_scenario_title_head">Scenārijs</string>
+    <string name="mdnie_scenario_summary_head">Uzstādīt mDNIe scenāriju</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-mk/arrays.xml b/AdvancedDisplay/res/values-mk/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-mk/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-mk/strings.xml b/AdvancedDisplay/res/values-mk/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-mk/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-ml/arrays.xml b/AdvancedDisplay/res/values-ml/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ml/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ml/strings.xml b/AdvancedDisplay/res/values-ml/strings.xml
index df265c1bf..6d67ab7ad 100644
--- a/AdvancedDisplay/res/values-ml/strings.xml
+++ b/AdvancedDisplay/res/values-ml/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">വികസിത ഡിസ്പ്ലേ</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">സ്ക്രീൻ</string>
-  <string name="screen_colors_title">നിറങ്ങൾ</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">അവസ്ഥ</string>
-  <string name="mdnie_scenario_summary_head">mDNle അവസ്ഥ സജ്ജമാക്കാൻ</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">വികസിത ഡിസ്പ്ലേ</string>
+    <string name="category_screen_title">സ്ക്രീൻ</string>
+    <string name="screen_colors_title">നിറങ്ങൾ</string>
+    <string name="mdnie_scenario_title_head">അവസ്ഥ</string>
+    <string name="mdnie_scenario_summary_head">mDNle അവസ്ഥ സജ്ജമാക്കാൻ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-mn/arrays.xml b/AdvancedDisplay/res/values-mn/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-mn/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-mn/strings.xml b/AdvancedDisplay/res/values-mn/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-mn/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-mr/arrays.xml b/AdvancedDisplay/res/values-mr/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-mr/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-mr/strings.xml b/AdvancedDisplay/res/values-mr/strings.xml
index 2be51b64c..55438961b 100644
--- a/AdvancedDisplay/res/values-mr/strings.xml
+++ b/AdvancedDisplay/res/values-mr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">प्रगत प्रदर्शन</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">स्क्रीन</string>
-  <string name="screen_colors_title">रंग</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">परिस्थिती</string>
-  <string name="mdnie_scenario_summary_head">mDNIe परिस्थिती सेट करा</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">प्रगत प्रदर्शन</string>
+    <string name="category_screen_title">स्क्रीन</string>
+    <string name="screen_colors_title">रंग</string>
+    <string name="mdnie_scenario_title_head">परिस्थिती</string>
+    <string name="mdnie_scenario_summary_head">mDNIe परिस्थिती सेट करा</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ms/arrays.xml b/AdvancedDisplay/res/values-ms/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ms/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ms/strings.xml b/AdvancedDisplay/res/values-ms/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-ms/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-my/arrays.xml b/AdvancedDisplay/res/values-my/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-my/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-my/strings.xml b/AdvancedDisplay/res/values-my/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-my/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-nb/arrays.xml b/AdvancedDisplay/res/values-nb/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-nb/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-nb/strings.xml b/AdvancedDisplay/res/values-nb/strings.xml
index 153b204a3..302176922 100644
--- a/AdvancedDisplay/res/values-nb/strings.xml
+++ b/AdvancedDisplay/res/values-nb/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Avansert visning</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Skjerm</string>
-  <string name="screen_colors_title">Farger</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Angi mDNIe scenariet</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Avansert visning</string>
+    <string name="category_screen_title">Skjerm</string>
+    <string name="screen_colors_title">Farger</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Angi mDNIe scenariet</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ne/arrays.xml b/AdvancedDisplay/res/values-ne/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ne/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ne/strings.xml b/AdvancedDisplay/res/values-ne/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-ne/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-nl/arrays.xml b/AdvancedDisplay/res/values-nl/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-nl/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-nl/strings.xml b/AdvancedDisplay/res/values-nl/strings.xml
index 86046964a..2a55f4524 100644
--- a/AdvancedDisplay/res/values-nl/strings.xml
+++ b/AdvancedDisplay/res/values-nl/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Geavanceerde instellingen</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Scherm</string>
-  <string name="screen_colors_title">Kleuren</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">mDNIe-scenario instellen</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Geavanceerde instellingen</string>
+    <string name="category_screen_title">Scherm</string>
+    <string name="screen_colors_title">Kleuren</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">mDNIe-scenario instellen</string>
+    <string name="mdnie_accessibility_title_head">Toegankelijkheidsmodus</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe-toegankelijkheidsmodus instellen</string>
+    <string name="mdnie_scenario_ui">LineageOS (standaard)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video (warm)</string>
+    <string name="mdnie_scenario_video_cold">Video (koud)</string>
+    <string name="mdnie_scenario_camera">Camera</string>
+    <string name="mdnie_scenario_navigation">Navigatie</string>
+    <string name="mdnie_scenario_gallery">Galerij</string>
+    <string name="mdnie_scenario_vt">Video-oproep</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digitale televisie</string>
+    <string name="mdnie_accessibility_normal">Normaal</string>
+    <string name="mdnie_accessibility_inverse">Omgekeerd</string>
+    <string name="mdnie_accessibility_color_blind">Kleurenblind</string>
+    <string name="mdnie_accessibility_screen_curtain">Schermgordijn</string>
+    <string name="mdnie_accessibility_grayscale">Grijs</string>
+    <string name="mdnie_accessibility_gray_negative">Grijs (omgekeerd)</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-oc/arrays.xml b/AdvancedDisplay/res/values-oc/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-oc/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-oc/strings.xml b/AdvancedDisplay/res/values-oc/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-oc/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-or-rIN/arrays.xml b/AdvancedDisplay/res/values-or-rIN/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-or-rIN/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-or-rIN/strings.xml b/AdvancedDisplay/res/values-or-rIN/strings.xml
index 49fe31ea0..cb9230ad5 100644
--- a/AdvancedDisplay/res/values-or-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-or-rIN/strings.xml
@@ -17,14 +17,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ଉନ୍ନତ ଡିସ୍‍ପ୍ଲେ</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">ସ୍କ୍ରିନ୍</string>
-  <string name="screen_colors_title">ରଙ୍ଗଗୁଡିକ</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">ଦୃଶ୍ୟପଟ</string>
-  <string name="mdnie_scenario_summary_head">mDNIe ଦୃଶ୍ୟପଟ ସେଟ୍‍ କରନ୍ତୁ</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">ଉନ୍ନତ ଡିସ୍‍ପ୍ଲେ</string>
+    <string name="category_screen_title">ସ୍କ୍ରିନ୍</string>
+    <string name="screen_colors_title">ରଙ୍ଗଗୁଡିକ</string>
+    <string name="mdnie_scenario_title_head">ଦୃଶ୍ୟପଟ</string>
+    <string name="mdnie_scenario_summary_head">mDNIe ଦୃଶ୍ୟପଟ ସେଟ୍‍ କରନ୍ତୁ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-am/strings.xml b/AdvancedDisplay/res/values-or/strings.xml
similarity index 65%
rename from AdvancedDisplay/res/values-am/strings.xml
rename to AdvancedDisplay/res/values-or/strings.xml
index c155d8901..9490fde27 100644
--- a/AdvancedDisplay/res/values-am/strings.xml
+++ b/AdvancedDisplay/res/values-or/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,9 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">ଉନ୍ନତ ଡିସ୍‍ପ୍ଲେ</string>
+    <string name="category_screen_title">ସ୍କ୍ରିନ୍</string>
+    <string name="screen_colors_title">ରଙ୍ଗଗୁଡିକ</string>
+    <string name="mdnie_scenario_title_head">ଦୃଶ୍ୟପଟ</string>
+    <string name="mdnie_scenario_summary_head">mDNIe ଦୃଶ୍ୟପଟ ସେଟ୍‍ କରନ୍ତୁ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-pa/arrays.xml b/AdvancedDisplay/res/values-pa/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-pa/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-pa/strings.xml b/AdvancedDisplay/res/values-pa/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-pa/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-pl/arrays.xml b/AdvancedDisplay/res/values-pl/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-pl/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-pl/strings.xml b/AdvancedDisplay/res/values-pl/strings.xml
index 92f17211e..3eb7c1ecd 100644
--- a/AdvancedDisplay/res/values-pl/strings.xml
+++ b/AdvancedDisplay/res/values-pl/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Zaawansowane ustawienia ekranu</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ekran</string>
-  <string name="screen_colors_title">Kolory</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenerie</string>
-  <string name="mdnie_scenario_summary_head">Ustaw scenariusz mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Zaawansowane ustawienia ekranu</string>
+    <string name="category_screen_title">Ekran</string>
+    <string name="screen_colors_title">Kolory</string>
+    <string name="mdnie_scenario_title_head">Scenerie</string>
+    <string name="mdnie_scenario_summary_head">Ustaw scenariusz mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Ułatwienia dostępu</string>
+    <string name="mdnie_accessibility_summary_head">Ustaw tryb dostępności mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (domyślnie)</string>
+    <string name="mdnie_scenario_video">Wideo</string>
+    <string name="mdnie_scenario_video_warm">Ciepły film</string>
+    <string name="mdnie_scenario_video_cold">Zimny film</string>
+    <string name="mdnie_scenario_camera">Aparat</string>
+    <string name="mdnie_scenario_navigation">Nawigacja</string>
+    <string name="mdnie_scenario_gallery">Galeria</string>
+    <string name="mdnie_scenario_vt">Połączenie wideo</string>
+    <string name="mdnie_scenario_browser">Przeglądarka</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Telewizja cyfrowa</string>
+    <string name="mdnie_accessibility_normal">Normalny</string>
+    <string name="mdnie_accessibility_inverse">Odwrócony</string>
+    <string name="mdnie_accessibility_color_blind">Daltonizm</string>
+    <string name="mdnie_accessibility_screen_curtain">Kurtyna ekranowa</string>
+    <string name="mdnie_accessibility_grayscale">Szary</string>
+    <string name="mdnie_accessibility_gray_negative">Szary, odwrócony</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-pt-rBR/arrays.xml b/AdvancedDisplay/res/values-pt-rBR/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-pt-rBR/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-pt-rBR/strings.xml b/AdvancedDisplay/res/values-pt-rBR/strings.xml
index b52691bf4..7ea5246ad 100644
--- a/AdvancedDisplay/res/values-pt-rBR/strings.xml
+++ b/AdvancedDisplay/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Display avançado</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Tela</string>
-  <string name="screen_colors_title">Cores</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Cenário</string>
-  <string name="mdnie_scenario_summary_head">Define o cenário mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Display avançado</string>
+    <string name="category_screen_title">Tela</string>
+    <string name="screen_colors_title">Cores</string>
+    <string name="mdnie_scenario_title_head">Cenário</string>
+    <string name="mdnie_scenario_summary_head">Define o cenário mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modo de acessibilidade</string>
+    <string name="mdnie_accessibility_summary_head">Definir o modo de acessibilidade do mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (padrão)</string>
+    <string name="mdnie_scenario_video">Vídeo</string>
+    <string name="mdnie_scenario_video_warm">Vídeo quente</string>
+    <string name="mdnie_scenario_video_cold">Vídeo frio</string>
+    <string name="mdnie_scenario_camera">Câmera</string>
+    <string name="mdnie_scenario_navigation">Navegação</string>
+    <string name="mdnie_scenario_gallery">Galeria</string>
+    <string name="mdnie_scenario_vt">Chamada de vídeo</string>
+    <string name="mdnie_scenario_browser">Navegador</string>
+    <string name="mdnie_scenario_ebook">e-book</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Televisão digital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Invertido</string>
+    <string name="mdnie_accessibility_color_blind">Daltônico</string>
+    <string name="mdnie_accessibility_screen_curtain">Filtro de tela</string>
+    <string name="mdnie_accessibility_grayscale">Cinza</string>
+    <string name="mdnie_accessibility_gray_negative">Cinza invertido</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-pt-rPT/arrays.xml b/AdvancedDisplay/res/values-pt-rPT/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-pt-rPT/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-pt-rPT/strings.xml b/AdvancedDisplay/res/values-pt-rPT/strings.xml
index b9c574be8..5d4c5669a 100644
--- a/AdvancedDisplay/res/values-pt-rPT/strings.xml
+++ b/AdvancedDisplay/res/values-pt-rPT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Visualização avançada</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ecrã</string>
-  <string name="screen_colors_title">Cores</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Cenário</string>
-  <string name="mdnie_scenario_summary_head">Definir o cenário mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Visualização avançada</string>
+    <string name="category_screen_title">Ecrã</string>
+    <string name="screen_colors_title">Cores</string>
+    <string name="mdnie_scenario_title_head">Cenário</string>
+    <string name="mdnie_scenario_summary_head">Definir o cenário mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Modo de acessibilidade</string>
+    <string name="mdnie_accessibility_summary_head">Definir o modo de acessibilidade do mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (padrão)</string>
+    <string name="mdnie_scenario_video">Vídeo</string>
+    <string name="mdnie_scenario_video_warm">Vídeo quente</string>
+    <string name="mdnie_scenario_video_cold">Vídeo frio</string>
+    <string name="mdnie_scenario_camera">Câmara</string>
+    <string name="mdnie_scenario_navigation">Navegação</string>
+    <string name="mdnie_scenario_gallery">Galeria</string>
+    <string name="mdnie_scenario_vt">Chamada de vídeo</string>
+    <string name="mdnie_scenario_browser">Navegador</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Televisão digital</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Invertido</string>
+    <string name="mdnie_accessibility_color_blind">Daltónico</string>
+    <string name="mdnie_accessibility_screen_curtain">Cortina de ecrã</string>
+    <string name="mdnie_accessibility_grayscale">Cinzento</string>
+    <string name="mdnie_accessibility_gray_negative">Cinzento invertido</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-rm/arrays.xml b/AdvancedDisplay/res/values-rm/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-rm/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-rm/strings.xml b/AdvancedDisplay/res/values-rm/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-rm/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-ro/arrays.xml b/AdvancedDisplay/res/values-ro/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ro/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ro/strings.xml b/AdvancedDisplay/res/values-ro/strings.xml
index 243c807e4..fc6c8e928 100644
--- a/AdvancedDisplay/res/values-ro/strings.xml
+++ b/AdvancedDisplay/res/values-ro/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Setări avansate de afișare</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ecran</string>
-  <string name="screen_colors_title">Culori</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenariu</string>
-  <string name="mdnie_scenario_summary_head">Setează scenariul mDNIe</string>
-  <string name="mdnie_accessibility_title_head">Mod accesibilitate</string>
-  <string name="mdnie_accessibility_summary_head">Setaţi modul de accesibilitate mDNIe</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (implicit)</string>
-  <string name="mdnie_scenario_video">Video</string>
-  <string name="mdnie_scenario_video_warm">Video cald</string>
-  <string name="mdnie_scenario_video_cold">Video rece</string>
-  <string name="mdnie_scenario_camera">Cameră</string>
-  <string name="mdnie_scenario_navigation">Navigare</string>
-  <string name="mdnie_scenario_gallery">Galerie</string>
-  <string name="mdnie_scenario_vt">Apel video</string>
-  <string name="mdnie_scenario_browser">Browser</string>
-  <string name="mdnie_scenario_ebook">eBook</string>
-  <string name="mdnie_scenario_email">E-mail</string>
-  <string name="mdnie_scenario_tdmb">Televiziune digitală</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">Normal</string>
-  <string name="mdnie_accessibility_inverse">Inversat</string>
-  <string name="mdnie_accessibility_color_blind">Daltonist</string>
-  <string name="mdnie_accessibility_screen_curtain">Cortină de ecran</string>
-  <string name="mdnie_accessibility_grayscale">Gri</string>
-  <string name="mdnie_accessibility_gray_negative">Gri inversat</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Setări avansate de afișare</string>
+    <string name="category_screen_title">Ecran</string>
+    <string name="screen_colors_title">Culori</string>
+    <string name="mdnie_scenario_title_head">Scenariu</string>
+    <string name="mdnie_scenario_summary_head">Setează scenariul mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Mod accesibilitate</string>
+    <string name="mdnie_accessibility_summary_head">Setaţi modul de accesibilitate mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (implicit)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video cald</string>
+    <string name="mdnie_scenario_video_cold">Video rece</string>
+    <string name="mdnie_scenario_camera">Cameră</string>
+    <string name="mdnie_scenario_navigation">Navigare</string>
+    <string name="mdnie_scenario_gallery">Galerie</string>
+    <string name="mdnie_scenario_vt">Apel video</string>
+    <string name="mdnie_scenario_browser">Browser</string>
+    <string name="mdnie_scenario_ebook">eBook</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Televiziune digitală</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Inversat</string>
+    <string name="mdnie_accessibility_color_blind">Daltonist</string>
+    <string name="mdnie_accessibility_screen_curtain">Cortină de ecran</string>
+    <string name="mdnie_accessibility_grayscale">Gri</string>
+    <string name="mdnie_accessibility_gray_negative">Gri inversat</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ru/arrays.xml b/AdvancedDisplay/res/values-ru/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ru/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ru/strings.xml b/AdvancedDisplay/res/values-ru/strings.xml
index 48ba613fa..986382f61 100644
--- a/AdvancedDisplay/res/values-ru/strings.xml
+++ b/AdvancedDisplay/res/values-ru/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Настройки экрана</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Экран</string>
-  <string name="screen_colors_title">Цвета</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Сценарий</string>
-  <string name="mdnie_scenario_summary_head">Установка сценария mDNIe</string>
-  <string name="mdnie_accessibility_title_head">Режим специальных возможностей</string>
-  <string name="mdnie_accessibility_summary_head">Настроить режим специальных возможностей mDNIe</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (по умолчанию)</string>
-  <string name="mdnie_scenario_video">Фильм</string>
-  <string name="mdnie_scenario_video_warm">Фильм (теплые тона)</string>
-  <string name="mdnie_scenario_video_cold">Фильм (холодные тона)</string>
-  <string name="mdnie_scenario_camera">Камера</string>
-  <string name="mdnie_scenario_navigation">Навигация</string>
-  <string name="mdnie_scenario_gallery">Галерея</string>
-  <string name="mdnie_scenario_vt">Видеовызов</string>
-  <string name="mdnie_scenario_browser">Браузер</string>
-  <string name="mdnie_scenario_ebook">Электронная книга</string>
-  <string name="mdnie_scenario_email">Электронная почта</string>
-  <string name="mdnie_scenario_tdmb">Цифровое телевидение</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">Нормальный</string>
-  <string name="mdnie_accessibility_inverse">Инвертированный</string>
-  <string name="mdnie_accessibility_color_blind">Дальтонизм</string>
-  <string name="mdnie_accessibility_screen_curtain">Затемнение экрана</string>
-  <string name="mdnie_accessibility_grayscale">Серый</string>
-  <string name="mdnie_accessibility_gray_negative">Инверсия серого</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Настройки экрана</string>
+    <string name="category_screen_title">Экран</string>
+    <string name="screen_colors_title">Цвета</string>
+    <string name="mdnie_scenario_title_head">Сценарий</string>
+    <string name="mdnie_scenario_summary_head">Установка сценария mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Режим специальных возможностей</string>
+    <string name="mdnie_accessibility_summary_head">Настроить режим специальных возможностей mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (по умолчанию)</string>
+    <string name="mdnie_scenario_video">Фильм</string>
+    <string name="mdnie_scenario_video_warm">Фильм (теплые тона)</string>
+    <string name="mdnie_scenario_video_cold">Фильм (холодные тона)</string>
+    <string name="mdnie_scenario_camera">Камера</string>
+    <string name="mdnie_scenario_navigation">Навигация</string>
+    <string name="mdnie_scenario_gallery">Галерея</string>
+    <string name="mdnie_scenario_vt">Видеовызов</string>
+    <string name="mdnie_scenario_browser">Браузер</string>
+    <string name="mdnie_scenario_ebook">Электронная книга</string>
+    <string name="mdnie_scenario_email">Электронная почта</string>
+    <string name="mdnie_scenario_tdmb">Цифровое телевидение</string>
+    <string name="mdnie_accessibility_normal">Нормальный</string>
+    <string name="mdnie_accessibility_inverse">Инвертированный</string>
+    <string name="mdnie_accessibility_color_blind">Дальтонизм</string>
+    <string name="mdnie_accessibility_screen_curtain">Затемнение экрана</string>
+    <string name="mdnie_accessibility_grayscale">Серый</string>
+    <string name="mdnie_accessibility_gray_negative">Инверсия серого</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sc-rIT/arrays.xml b/AdvancedDisplay/res/values-sc-rIT/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sc-rIT/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sc-rIT/strings.xml b/AdvancedDisplay/res/values-sc-rIT/strings.xml
index e88fea441..02e96a677 100644
--- a/AdvancedDisplay/res/values-sc-rIT/strings.xml
+++ b/AdvancedDisplay/res/values-sc-rIT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,11 +16,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ischermu</string>
-  <string name="screen_colors_title">Colores</string>
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="category_screen_title">Ischermu</string>
+    <string name="screen_colors_title">Colores</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-si/arrays.xml b/AdvancedDisplay/res/values-si/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-si/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-si/strings.xml b/AdvancedDisplay/res/values-si/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-si/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-sk/arrays.xml b/AdvancedDisplay/res/values-sk/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sk/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sk/strings.xml b/AdvancedDisplay/res/values-sk/strings.xml
index edd2ef07e..aab618bfa 100644
--- a/AdvancedDisplay/res/values-sk/strings.xml
+++ b/AdvancedDisplay/res/values-sk/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Pokročilé zobrazenie</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Obrazovka</string>
-  <string name="screen_colors_title">Farby</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenár</string>
-  <string name="mdnie_scenario_summary_head">Nastaviť scenár mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Pokročilé zobrazenie</string>
+    <string name="category_screen_title">Obrazovka</string>
+    <string name="screen_colors_title">Farby</string>
+    <string name="mdnie_scenario_title_head">Scenár</string>
+    <string name="mdnie_scenario_summary_head">Nastaviť scenár mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Režim uľahčenia ovládania</string>
+    <string name="mdnie_accessibility_summary_head">Nastavenie režimu uľahčenia ovládania mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (predvolené)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video (teplé tóny)</string>
+    <string name="mdnie_scenario_video_cold">Video (studené tóny)</string>
+    <string name="mdnie_scenario_camera">Fotoaparát</string>
+    <string name="mdnie_scenario_navigation">Navigácia</string>
+    <string name="mdnie_scenario_gallery">Galéria</string>
+    <string name="mdnie_scenario_vt">Videohovor</string>
+    <string name="mdnie_scenario_browser">Prehliadač</string>
+    <string name="mdnie_scenario_ebook">Elektronická kniha</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Digitálna televízia</string>
+    <string name="mdnie_accessibility_normal">Normalny</string>
+    <string name="mdnie_accessibility_inverse">Obrátený</string>
+    <string name="mdnie_accessibility_color_blind">Farbosleposť</string>
+    <string name="mdnie_accessibility_screen_curtain">Záclony v obraze</string>
+    <string name="mdnie_accessibility_grayscale">Šedý zákal</string>
+    <string name="mdnie_accessibility_gray_negative">Obrátený šedý zákal</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sl/arrays.xml b/AdvancedDisplay/res/values-sl/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sl/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sl/strings.xml b/AdvancedDisplay/res/values-sl/strings.xml
index 0551da695..3b54a0b14 100644
--- a/AdvancedDisplay/res/values-sl/strings.xml
+++ b/AdvancedDisplay/res/values-sl/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Napreden zaslon</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Zaslon</string>
-  <string name="screen_colors_title">Barve</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenarij</string>
-  <string name="mdnie_scenario_summary_head">Nastavite scenarij mDNIe</string>
-  <string name="mdnie_accessibility_title_head">Način dostopnosti</string>
-  <string name="mdnie_accessibility_summary_head">Nastavite način dostopnosti mDNIe</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (privzeto)</string>
-  <string name="mdnie_scenario_video">Video</string>
-  <string name="mdnie_scenario_video_warm">Topel videoposnetek</string>
-  <string name="mdnie_scenario_video_cold">Hladen videoposnetek</string>
-  <string name="mdnie_scenario_camera">Fotoaparat</string>
-  <string name="mdnie_scenario_navigation">Navigacija</string>
-  <string name="mdnie_scenario_gallery">Galerija</string>
-  <string name="mdnie_scenario_vt">Video klic</string>
-  <string name="mdnie_scenario_browser">Brskalnik</string>
-  <string name="mdnie_scenario_ebook">E-knjiga</string>
-  <string name="mdnie_scenario_email">E-pošta</string>
-  <string name="mdnie_scenario_tdmb">Digitalna tv</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">Običajno</string>
-  <string name="mdnie_accessibility_inverse">Obrnjeno</string>
-  <string name="mdnie_accessibility_color_blind">Barvna slepota</string>
-  <string name="mdnie_accessibility_screen_curtain">Zaslonska zavesa</string>
-  <string name="mdnie_accessibility_grayscale">Sivina</string>
-  <string name="mdnie_accessibility_gray_negative">Obrnjena sivina</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Napreden zaslon</string>
+    <string name="category_screen_title">Zaslon</string>
+    <string name="screen_colors_title">Barve</string>
+    <string name="mdnie_scenario_title_head">Scenarij</string>
+    <string name="mdnie_scenario_summary_head">Nastavite scenarij mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Način dostopnosti</string>
+    <string name="mdnie_accessibility_summary_head">Nastavite način dostopnosti mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (privzeto)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Topel videoposnetek</string>
+    <string name="mdnie_scenario_video_cold">Hladen videoposnetek</string>
+    <string name="mdnie_scenario_camera">Fotoaparat</string>
+    <string name="mdnie_scenario_navigation">Navigacija</string>
+    <string name="mdnie_scenario_gallery">Galerija</string>
+    <string name="mdnie_scenario_vt">Video klic</string>
+    <string name="mdnie_scenario_browser">Brskalnik</string>
+    <string name="mdnie_scenario_ebook">E-knjiga</string>
+    <string name="mdnie_scenario_email">E-pošta</string>
+    <string name="mdnie_scenario_tdmb">Digitalna tv</string>
+    <string name="mdnie_accessibility_normal">Običajno</string>
+    <string name="mdnie_accessibility_inverse">Obrnjeno</string>
+    <string name="mdnie_accessibility_color_blind">Barvna slepota</string>
+    <string name="mdnie_accessibility_screen_curtain">Zaslonska zavesa</string>
+    <string name="mdnie_accessibility_grayscale">Sivina</string>
+    <string name="mdnie_accessibility_gray_negative">Obrnjena sivina</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sq/arrays.xml b/AdvancedDisplay/res/values-sq/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sq/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sq/strings.xml b/AdvancedDisplay/res/values-sq/strings.xml
index 0d14f4f87..2b45be4f6 100644
--- a/AdvancedDisplay/res/values-sq/strings.xml
+++ b/AdvancedDisplay/res/values-sq/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Ekran i përparuar</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ekrani</string>
-  <string name="screen_colors_title">Ngjyrat</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Skenari</string>
-  <string name="mdnie_scenario_summary_head">Vendos skenarin mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Ekran i përparuar</string>
+    <string name="category_screen_title">Ekrani</string>
+    <string name="screen_colors_title">Ngjyrat</string>
+    <string name="mdnie_scenario_title_head">Skenari</string>
+    <string name="mdnie_scenario_summary_head">Vendos skenarin mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Metoda e Qasshmerisë</string>
+    <string name="mdnie_accessibility_summary_head">Vendos mDNIe në metodë qasshmërie</string>
+    <string name="mdnie_scenario_ui">LineageOS (E paracaktuar)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video e ngrohtë</string>
+    <string name="mdnie_scenario_video_cold">Video e akullt</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Lundrimi</string>
+    <string name="mdnie_scenario_gallery">Galeria</string>
+    <string name="mdnie_scenario_vt">Thirrje me video</string>
+    <string name="mdnie_scenario_browser">Shfletuesi</string>
+    <string name="mdnie_scenario_ebook">eLibër</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Televizion dixhital</string>
+    <string name="mdnie_accessibility_normal">Normale</string>
+    <string name="mdnie_accessibility_inverse">Përmbysur</string>
+    <string name="mdnie_accessibility_color_blind">Daltonik</string>
+    <string name="mdnie_accessibility_screen_curtain">Perde të ekranit</string>
+    <string name="mdnie_accessibility_grayscale">Gri</string>
+    <string name="mdnie_accessibility_gray_negative">Gri e përmbysur</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sr/arrays.xml b/AdvancedDisplay/res/values-sr/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sr/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sr/strings.xml b/AdvancedDisplay/res/values-sr/strings.xml
index 48d6c255e..5d26048d7 100644
--- a/AdvancedDisplay/res/values-sr/strings.xml
+++ b/AdvancedDisplay/res/values-sr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Напредни екран</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Екран</string>
-  <string name="screen_colors_title">Боје</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Сценарио</string>
-  <string name="mdnie_scenario_summary_head">Постави mDNIe сценарио</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Напредни екран</string>
+    <string name="category_screen_title">Екран</string>
+    <string name="screen_colors_title">Боје</string>
+    <string name="mdnie_scenario_title_head">Сценарио</string>
+    <string name="mdnie_scenario_summary_head">Постави mDNIe сценарио</string>
+    <string name="mdnie_accessibility_title_head">Режим за приступачност</string>
+    <string name="mdnie_accessibility_summary_head">Поставите mDNIe у режим за приступачност</string>
+    <string name="mdnie_scenario_ui">LineageOS (подразумевано)</string>
+    <string name="mdnie_scenario_video">Видео</string>
+    <string name="mdnie_scenario_video_warm">Видео топле боје</string>
+    <string name="mdnie_scenario_video_cold">Видео хладне боје</string>
+    <string name="mdnie_scenario_camera">Камера</string>
+    <string name="mdnie_scenario_navigation">Навигација</string>
+    <string name="mdnie_scenario_gallery">Галерија</string>
+    <string name="mdnie_scenario_vt">Видео позив</string>
+    <string name="mdnie_scenario_browser">Прегледач</string>
+    <string name="mdnie_scenario_ebook">еКњига</string>
+    <string name="mdnie_scenario_email">Е-пошта</string>
+    <string name="mdnie_scenario_tdmb">Дигитална телевизија</string>
+    <string name="mdnie_accessibility_normal">Нормално</string>
+    <string name="mdnie_accessibility_inverse">Изврнуто</string>
+    <string name="mdnie_accessibility_color_blind">За далтонисте</string>
+    <string name="mdnie_accessibility_screen_curtain">Завеса екрана</string>
+    <string name="mdnie_accessibility_grayscale">Сиво</string>
+    <string name="mdnie_accessibility_gray_negative">Изврнуто сиво</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sv/arrays.xml b/AdvancedDisplay/res/values-sv/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sv/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sv/strings.xml b/AdvancedDisplay/res/values-sv/strings.xml
index cba3fc78f..53615090a 100644
--- a/AdvancedDisplay/res/values-sv/strings.xml
+++ b/AdvancedDisplay/res/values-sv/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Avancerad visning</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Skärm</string>
-  <string name="screen_colors_title">Färger</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Scenario</string>
-  <string name="mdnie_scenario_summary_head">Ställ in mDNIe-scenario</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Avancerad visning</string>
+    <string name="category_screen_title">Skärm</string>
+    <string name="screen_colors_title">Färger</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Ställ in mDNIe-scenario</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sw/arrays.xml b/AdvancedDisplay/res/values-sw/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-sw/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-sw/strings.xml b/AdvancedDisplay/res/values-sw/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-sw/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-ta/arrays.xml b/AdvancedDisplay/res/values-ta/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ta/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ta/strings.xml b/AdvancedDisplay/res/values-ta/strings.xml
index 94ae81978..120687fc6 100644
--- a/AdvancedDisplay/res/values-ta/strings.xml
+++ b/AdvancedDisplay/res/values-ta/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">மேம்பட்ட காட்சி</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">திரை</string>
-  <string name="screen_colors_title">நிறங்கள்</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">சூழ்நிலை</string>
-  <string name="mdnie_scenario_summary_head">mDNIe சூழ்நிலையை அமை</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">மேம்பட்ட காட்சி</string>
+    <string name="category_screen_title">திரை</string>
+    <string name="screen_colors_title">நிறங்கள்</string>
+    <string name="mdnie_scenario_title_head">சூழ்நிலை</string>
+    <string name="mdnie_scenario_summary_head">mDNIe சூழ்நிலையை அமை</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-te/arrays.xml b/AdvancedDisplay/res/values-te/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-te/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-te/strings.xml b/AdvancedDisplay/res/values-te/strings.xml
index 72dcff96a..b3e0bb0e4 100644
--- a/AdvancedDisplay/res/values-te/strings.xml
+++ b/AdvancedDisplay/res/values-te/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">అధునాతన ప్రదర్శన</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">స్క్రీన్</string>
-  <string name="screen_colors_title">రంగులు</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">దృశ్యవివరణ</string>
-  <string name="mdnie_scenario_summary_head">mDNIe దృశ్యవివరణను సెట్ చేయుము</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">అధునాతన ప్రదర్శన</string>
+    <string name="category_screen_title">స్క్రీన్</string>
+    <string name="screen_colors_title">రంగులు</string>
+    <string name="mdnie_scenario_title_head">దృశ్యవివరణ</string>
+    <string name="mdnie_scenario_summary_head">mDNIe దృశ్యవివరణను సెట్ చేయుము</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-th/arrays.xml b/AdvancedDisplay/res/values-th/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-th/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-th/strings.xml b/AdvancedDisplay/res/values-th/strings.xml
index f3e23daaa..a4caefbbf 100644
--- a/AdvancedDisplay/res/values-th/strings.xml
+++ b/AdvancedDisplay/res/values-th/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">หน้าจอขั้นสูง</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">หน้าจอ</string>
-  <string name="screen_colors_title">สี</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">สถานการณ์</string>
-  <string name="mdnie_scenario_summary_head">กำหนดสถานการณ์ mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">หน้าจอขั้นสูง</string>
+    <string name="category_screen_title">หน้าจอ</string>
+    <string name="screen_colors_title">สี</string>
+    <string name="mdnie_scenario_title_head">สถานการณ์</string>
+    <string name="mdnie_scenario_summary_head">กำหนดสถานการณ์ mDNIe</string>
+    <string name="mdnie_accessibility_title_head">โหมดการเข้าถึง</string>
+    <string name="mdnie_accessibility_summary_head">ตั้งค่าโหมดการเข้าถึง mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (เริ่มต้น)</string>
+    <string name="mdnie_scenario_video">วิดีโอ</string>
+    <string name="mdnie_scenario_video_warm">วิดีโออบอุ่น</string>
+    <string name="mdnie_scenario_video_cold">วิดีโอเย็น</string>
+    <string name="mdnie_scenario_camera">กล้องถ่ายรูป</string>
+    <string name="mdnie_scenario_navigation">การนำทาง</string>
+    <string name="mdnie_scenario_gallery">แกลเลอรี</string>
+    <string name="mdnie_scenario_vt">วิดีโอคอล</string>
+    <string name="mdnie_scenario_browser">เบราว์เซอร์</string>
+    <string name="mdnie_scenario_ebook">หนังสืออีเล็กทรอนิกส์</string>
+    <string name="mdnie_scenario_email">อีเมล</string>
+    <string name="mdnie_scenario_tdmb">โทรทัศน์ดิจิตอล</string>
+    <string name="mdnie_accessibility_normal">ปกติ</string>
+    <string name="mdnie_accessibility_inverse">กลับสี</string>
+    <string name="mdnie_accessibility_color_blind">ตาบอดสี</string>
+    <string name="mdnie_accessibility_screen_curtain">จอม่าน</string>
+    <string name="mdnie_accessibility_grayscale">สีเทา</string>
+    <string name="mdnie_accessibility_gray_negative">กลับสีเทา</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-tl/arrays.xml b/AdvancedDisplay/res/values-tl/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-tl/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-tl/strings.xml b/AdvancedDisplay/res/values-tl/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-tl/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-tr/arrays.xml b/AdvancedDisplay/res/values-tr/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-tr/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-tr/strings.xml b/AdvancedDisplay/res/values-tr/strings.xml
index 5753d2f31..16e9969be 100644
--- a/AdvancedDisplay/res/values-tr/strings.xml
+++ b/AdvancedDisplay/res/values-tr/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Gelişmiş ekran</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Ekran</string>
-  <string name="screen_colors_title">Renkler</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Ekran Modu</string>
-  <string name="mdnie_scenario_summary_head">mDNIe senaryosunu ayarla</string>
-  <string name="mdnie_accessibility_title_head">Erişilebilirlik modu</string>
-  <string name="mdnie_accessibility_summary_head">mDNIe ile erişilebilirlik modunu ayarlayın</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (varsayılan)</string>
-  <string name="mdnie_scenario_video">Video</string>
-  <string name="mdnie_scenario_video_warm">Video sıcak</string>
-  <string name="mdnie_scenario_video_cold">Video soğuk</string>
-  <string name="mdnie_scenario_camera">Kamera</string>
-  <string name="mdnie_scenario_navigation">Gezinme</string>
-  <string name="mdnie_scenario_gallery">Galeri</string>
-  <string name="mdnie_scenario_vt">Görüntülü arama</string>
-  <string name="mdnie_scenario_browser">Tarayıcı</string>
-  <string name="mdnie_scenario_ebook">E-kitap</string>
-  <string name="mdnie_scenario_email">E-posta</string>
-  <string name="mdnie_scenario_tdmb">Dijital televizyon</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">Normal</string>
-  <string name="mdnie_accessibility_inverse">Ters çevrilmiş</string>
-  <string name="mdnie_accessibility_color_blind">Renk körü</string>
-  <string name="mdnie_accessibility_screen_curtain">Ekran perdesi</string>
-  <string name="mdnie_accessibility_grayscale">Gri</string>
-  <string name="mdnie_accessibility_gray_negative">Ters gri</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Gelişmiş ekran</string>
+    <string name="category_screen_title">Ekran</string>
+    <string name="screen_colors_title">Renkler</string>
+    <string name="mdnie_scenario_title_head">Ekran Modu</string>
+    <string name="mdnie_scenario_summary_head">mDNIe ekran modunu ayarla</string>
+    <string name="mdnie_accessibility_title_head">Erişilebilirlik modu</string>
+    <string name="mdnie_accessibility_summary_head">mDNIe ile erişilebilirlik modunu ayarlayın</string>
+    <string name="mdnie_scenario_ui">LineageOS (varsayılan)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video sıcak</string>
+    <string name="mdnie_scenario_video_cold">Video soğuk</string>
+    <string name="mdnie_scenario_camera">Kamera</string>
+    <string name="mdnie_scenario_navigation">Gezinme</string>
+    <string name="mdnie_scenario_gallery">Galeri</string>
+    <string name="mdnie_scenario_vt">Görüntülü arama</string>
+    <string name="mdnie_scenario_browser">Tarayıcı</string>
+    <string name="mdnie_scenario_ebook">E-kitap</string>
+    <string name="mdnie_scenario_email">E-posta</string>
+    <string name="mdnie_scenario_tdmb">Dijital televizyon</string>
+    <string name="mdnie_accessibility_normal">Normal</string>
+    <string name="mdnie_accessibility_inverse">Ters çevrilmiş</string>
+    <string name="mdnie_accessibility_color_blind">Renk körü</string>
+    <string name="mdnie_accessibility_screen_curtain">Ekran perdesi</string>
+    <string name="mdnie_accessibility_grayscale">Gri</string>
+    <string name="mdnie_accessibility_gray_negative">Ters gri</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ug/arrays.xml b/AdvancedDisplay/res/values-ug/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ug/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ug/strings.xml b/AdvancedDisplay/res/values-ug/strings.xml
index 937f14059..c247db056 100644
--- a/AdvancedDisplay/res/values-ug/strings.xml
+++ b/AdvancedDisplay/res/values-ug/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ئالىي ئېكران</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">ئېكران</string>
-  <string name="screen_colors_title">رەڭلەر</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">كۆرۈنۈش</string>
-  <string name="mdnie_scenario_summary_head">mDNIe لايىھە تەڭشىكى</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">ئالىي ئېكران</string>
+    <string name="category_screen_title">ئېكران</string>
+    <string name="screen_colors_title">رەڭلەر</string>
+    <string name="mdnie_scenario_title_head">كۆرۈنۈش</string>
+    <string name="mdnie_scenario_summary_head">mDNIe لايىھە تەڭشىكى</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-uk/arrays.xml b/AdvancedDisplay/res/values-uk/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-uk/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-uk/strings.xml b/AdvancedDisplay/res/values-uk/strings.xml
index 56d3b7f9e..01976c608 100644
--- a/AdvancedDisplay/res/values-uk/strings.xml
+++ b/AdvancedDisplay/res/values-uk/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,14 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Додаткові налаштування екрану</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Екран</string>
-  <string name="screen_colors_title">Кольори</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Сценарій</string>
-  <string name="mdnie_scenario_summary_head">Встановити сценарій mDNIe</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Додаткові налаштування екрану</string>
+    <string name="category_screen_title">Екран</string>
+    <string name="screen_colors_title">Кольори</string>
+    <string name="mdnie_scenario_title_head">Сценарій</string>
+    <string name="mdnie_scenario_summary_head">Встановити сценарій mDNIe</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ur/arrays.xml b/AdvancedDisplay/res/values-ur/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-ur/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-ur/strings.xml b/AdvancedDisplay/res/values-ur/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-ur/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-uz/arrays.xml b/AdvancedDisplay/res/values-uz/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-uz/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-uz/strings.xml b/AdvancedDisplay/res/values-uz/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-uz/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-vec/arrays.xml b/AdvancedDisplay/res/values-vec/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-vec/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-vec/strings.xml b/AdvancedDisplay/res/values-vec/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-vec/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/AdvancedDisplay/res/values-vi/arrays.xml b/AdvancedDisplay/res/values-vi/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-vi/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-vi/strings.xml b/AdvancedDisplay/res/values-vi/strings.xml
index 2a4845e9d..5a20fb760 100644
--- a/AdvancedDisplay/res/values-vi/strings.xml
+++ b/AdvancedDisplay/res/values-vi/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Hiển thị nâng cao</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">Màn hình</string>
-  <string name="screen_colors_title">Màu</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">Tình huống</string>
-  <string name="mdnie_scenario_summary_head">Đặt tình huống cho mDNIe</string>
-  <string name="mdnie_accessibility_title_head">Chế độ trợ năng</string>
-  <string name="mdnie_accessibility_summary_head">Cài đặt chế độ trợ năng mDNIe</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (mặc định)</string>
-  <string name="mdnie_scenario_video">Video</string>
-  <string name="mdnie_scenario_video_warm">Video ấm</string>
-  <string name="mdnie_scenario_video_cold">Video lạnh</string>
-  <string name="mdnie_scenario_camera">Máy ảnh</string>
-  <string name="mdnie_scenario_navigation">Điều hướng</string>
-  <string name="mdnie_scenario_gallery">Thư viện</string>
-  <string name="mdnie_scenario_vt">Cuộc gọi video</string>
-  <string name="mdnie_scenario_browser">Trình duyệt</string>
-  <string name="mdnie_scenario_ebook">sách điện tử</string>
-  <string name="mdnie_scenario_email">E-mail</string>
-  <string name="mdnie_scenario_tdmb">Truyền hình kỹ thuật số</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">Bình thường</string>
-  <string name="mdnie_accessibility_inverse">Đảo ngược</string>
-  <string name="mdnie_accessibility_color_blind">Mù màu</string>
-  <string name="mdnie_accessibility_screen_curtain">Bảo vệ màn hình</string>
-  <string name="mdnie_accessibility_grayscale">Xám</string>
-  <string name="mdnie_accessibility_gray_negative">Đảo ngược màu xám</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">Hiển thị nâng cao</string>
+    <string name="category_screen_title">Màn hình</string>
+    <string name="screen_colors_title">Màu</string>
+    <string name="mdnie_scenario_title_head">Tình huống</string>
+    <string name="mdnie_scenario_summary_head">Đặt tình huống cho mDNIe</string>
+    <string name="mdnie_accessibility_title_head">Chế độ trợ năng</string>
+    <string name="mdnie_accessibility_summary_head">Cài đặt chế độ trợ năng mDNIe</string>
+    <string name="mdnie_scenario_ui">LineageOS (mặc định)</string>
+    <string name="mdnie_scenario_video">Video</string>
+    <string name="mdnie_scenario_video_warm">Video ấm</string>
+    <string name="mdnie_scenario_video_cold">Video lạnh</string>
+    <string name="mdnie_scenario_camera">Máy ảnh</string>
+    <string name="mdnie_scenario_navigation">Điều hướng</string>
+    <string name="mdnie_scenario_gallery">Thư viện</string>
+    <string name="mdnie_scenario_vt">Cuộc gọi video</string>
+    <string name="mdnie_scenario_browser">Trình duyệt</string>
+    <string name="mdnie_scenario_ebook">sách điện tử</string>
+    <string name="mdnie_scenario_email">E-mail</string>
+    <string name="mdnie_scenario_tdmb">Truyền hình kỹ thuật số</string>
+    <string name="mdnie_accessibility_normal">Bình thường</string>
+    <string name="mdnie_accessibility_inverse">Đảo ngược</string>
+    <string name="mdnie_accessibility_color_blind">Mù màu</string>
+    <string name="mdnie_accessibility_screen_curtain">Bảo vệ màn hình</string>
+    <string name="mdnie_accessibility_grayscale">Xám</string>
+    <string name="mdnie_accessibility_gray_negative">Đảo ngược màu xám</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-zh-rCN/arrays.xml b/AdvancedDisplay/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-zh-rCN/strings.xml b/AdvancedDisplay/res/values-zh-rCN/strings.xml
index 67644564e..5f54d1cd9 100644
--- a/AdvancedDisplay/res/values-zh-rCN/strings.xml
+++ b/AdvancedDisplay/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">高级显示</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">屏幕</string>
-  <string name="screen_colors_title">颜色</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">场景</string>
-  <string name="mdnie_scenario_summary_head">设置 mDNIe 场景</string>
-  <string name="mdnie_accessibility_title_head">无障碍模式</string>
-  <string name="mdnie_accessibility_summary_head">设置 mDNIe 无障碍模式</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (默认)</string>
-  <string name="mdnie_scenario_video">视频</string>
-  <string name="mdnie_scenario_video_warm">视频模式 (温)</string>
-  <string name="mdnie_scenario_video_cold">视频模式 (冷)</string>
-  <string name="mdnie_scenario_camera">相机</string>
-  <string name="mdnie_scenario_navigation">导航</string>
-  <string name="mdnie_scenario_gallery">图库</string>
-  <string name="mdnie_scenario_vt">视频通话</string>
-  <string name="mdnie_scenario_browser">浏览器</string>
-  <string name="mdnie_scenario_ebook">电子书</string>
-  <string name="mdnie_scenario_email">电子邮件</string>
-  <string name="mdnie_scenario_tdmb">数字电视</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">普通</string>
-  <string name="mdnie_accessibility_inverse">反色</string>
-  <string name="mdnie_accessibility_color_blind">色盲模式</string>
-  <string name="mdnie_accessibility_screen_curtain">屏幕遮蔽</string>
-  <string name="mdnie_accessibility_grayscale">灰度</string>
-  <string name="mdnie_accessibility_gray_negative">反色灰度</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">高级显示</string>
+    <string name="category_screen_title">屏幕</string>
+    <string name="screen_colors_title">颜色</string>
+    <string name="mdnie_scenario_title_head">场景</string>
+    <string name="mdnie_scenario_summary_head">设置 mDNIe 场景</string>
+    <string name="mdnie_accessibility_title_head">无障碍模式</string>
+    <string name="mdnie_accessibility_summary_head">设置 mDNIe 无障碍模式</string>
+    <string name="mdnie_scenario_ui">LineageOS (默认)</string>
+    <string name="mdnie_scenario_video">视频</string>
+    <string name="mdnie_scenario_video_warm">视频模式 (温)</string>
+    <string name="mdnie_scenario_video_cold">视频模式 (冷)</string>
+    <string name="mdnie_scenario_camera">相机</string>
+    <string name="mdnie_scenario_navigation">导航</string>
+    <string name="mdnie_scenario_gallery">图库</string>
+    <string name="mdnie_scenario_vt">视频通话</string>
+    <string name="mdnie_scenario_browser">浏览器</string>
+    <string name="mdnie_scenario_ebook">电子书</string>
+    <string name="mdnie_scenario_email">电子邮件</string>
+    <string name="mdnie_scenario_tdmb">数字电视</string>
+    <string name="mdnie_accessibility_normal">普通</string>
+    <string name="mdnie_accessibility_inverse">反色</string>
+    <string name="mdnie_accessibility_color_blind">色盲模式</string>
+    <string name="mdnie_accessibility_screen_curtain">屏幕遮罩</string>
+    <string name="mdnie_accessibility_grayscale">灰度</string>
+    <string name="mdnie_accessibility_gray_negative">反色灰度</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-zh-rHK/arrays.xml b/AdvancedDisplay/res/values-zh-rHK/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-zh-rHK/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-zh-rHK/strings.xml b/AdvancedDisplay/res/values-zh-rHK/strings.xml
index 63ef09bcb..737e30536 100644
--- a/AdvancedDisplay/res/values-zh-rHK/strings.xml
+++ b/AdvancedDisplay/res/values-zh-rHK/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,12 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Screen Preference -->
-  <string name="category_screen_title">螢幕</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">場景</string>
-  <string name="mdnie_scenario_summary_head">設定 mDNIe 場景</string>
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="category_screen_title">螢幕</string>
+    <string name="mdnie_scenario_title_head">場景</string>
+    <string name="mdnie_scenario_summary_head">設定 mDNIe 場景</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-zh-rTW/arrays.xml b/AdvancedDisplay/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-zh-rTW/strings.xml b/AdvancedDisplay/res/values-zh-rTW/strings.xml
index 9a83ded30..4cd8b5b5a 100644
--- a/AdvancedDisplay/res/values-zh-rTW/strings.xml
+++ b/AdvancedDisplay/res/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2014 The CyanogenMod Project
      Copyright (C) 2018 The LineageOS Project
@@ -17,34 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">進階顯示</string>
-  <!-- Screen Preference -->
-  <string name="category_screen_title">螢幕</string>
-  <string name="screen_colors_title">色彩</string>
-  <!-- mDNIe -->
-  <string name="mdnie_scenario_title_head">場景</string>
-  <string name="mdnie_scenario_summary_head">設定 mDNIe 場景</string>
-  <string name="mdnie_accessibility_title_head">無障礙模式</string>
-  <string name="mdnie_accessibility_summary_head">設定 mDNIe 無障礙模式</string>
-  <!-- Scenario names -->
-  <string name="mdnie_scenario_ui">LineageOS (預設)</string>
-  <string name="mdnie_scenario_video">視訊</string>
-  <string name="mdnie_scenario_video_warm">影片 (暖色)</string>
-  <string name="mdnie_scenario_video_cold">影片 (冷色)</string>
-  <string name="mdnie_scenario_camera">相機</string>
-  <string name="mdnie_scenario_navigation">導覽</string>
-  <string name="mdnie_scenario_gallery">圖片庫</string>
-  <string name="mdnie_scenario_vt">視訊通話</string>
-  <string name="mdnie_scenario_browser">瀏覽器</string>
-  <string name="mdnie_scenario_ebook">電子書</string>
-  <string name="mdnie_scenario_email">電子郵件</string>
-  <string name="mdnie_scenario_tdmb">數位電視</string>
-  <!-- Accessibility mode names -->
-  <string name="mdnie_accessibility_normal">一般</string>
-  <string name="mdnie_accessibility_inverse">負片</string>
-  <string name="mdnie_accessibility_color_blind">色盲模式</string>
-  <string name="mdnie_accessibility_screen_curtain">黑屏模式</string>
-  <string name="mdnie_accessibility_grayscale">灰色</string>
-  <string name="mdnie_accessibility_gray_negative">負片灰階</string>
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+    <string name="app_name">進階顯示</string>
+    <string name="category_screen_title">螢幕</string>
+    <string name="screen_colors_title">色彩</string>
+    <string name="mdnie_scenario_title_head">場景</string>
+    <string name="mdnie_scenario_summary_head">設定 mDNIe 場景</string>
+    <string name="mdnie_accessibility_title_head">無障礙模式</string>
+    <string name="mdnie_accessibility_summary_head">設定 mDNIe 無障礙模式</string>
+    <string name="mdnie_scenario_ui">LineageOS (預設)</string>
+    <string name="mdnie_scenario_video">視訊</string>
+    <string name="mdnie_scenario_video_warm">影片 (暖色)</string>
+    <string name="mdnie_scenario_video_cold">影片 (冷色)</string>
+    <string name="mdnie_scenario_camera">相機</string>
+    <string name="mdnie_scenario_navigation">導覽</string>
+    <string name="mdnie_scenario_gallery">圖片庫</string>
+    <string name="mdnie_scenario_vt">視訊通話</string>
+    <string name="mdnie_scenario_browser">瀏覽器</string>
+    <string name="mdnie_scenario_ebook">電子書</string>
+    <string name="mdnie_scenario_email">電子郵件</string>
+    <string name="mdnie_scenario_tdmb">數位電視</string>
+    <string name="mdnie_accessibility_normal">一般</string>
+    <string name="mdnie_accessibility_inverse">負片</string>
+    <string name="mdnie_accessibility_color_blind">色盲模式</string>
+    <string name="mdnie_accessibility_screen_curtain">黑屏模式</string>
+    <string name="mdnie_accessibility_grayscale">灰色</string>
+    <string name="mdnie_accessibility_gray_negative">負片灰階</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-zu/arrays.xml b/AdvancedDisplay/res/values-zu/arrays.xml
deleted file mode 100644
index f01db504b..000000000
--- a/AdvancedDisplay/res/values-zu/arrays.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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"></resources>
diff --git a/AdvancedDisplay/res/values-zu/strings.xml b/AdvancedDisplay/res/values-zu/strings.xml
deleted file mode 100644
index c155d8901..000000000
--- a/AdvancedDisplay/res/values-zu/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2014 The CyanogenMod Project
-     Copyright (C) 2018 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">
-  <!-- Screen Preference -->
-  <!-- mDNIe -->
-  <!-- Scenario names -->
-  <!-- Accessibility mode names -->
-  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
-</resources>
diff --git a/audio/Android.mk b/audio/Android.mk
index f369f7cd9..64ada4852 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -51,7 +51,7 @@ LOCAL_C_INCLUDES += \
 	$(call include-path-for, audio-effects)
 
 LOCAL_CFLAGS := -Werror -Wall
-#LOCAL_CFLAGS += -DPREPROCESSING_ENABLED
+LOCAL_CFLAGS += -DPREPROCESSING_ENABLED
 
 LOCAL_MODULE := audio.primary.$(TARGET_BOOTLOADER_BOARD_NAME)
 
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index f97758cfe..712d3f801 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -72,7 +72,7 @@ static struct pcm_device_profile pcm_device_playback = {
     .id = SOUND_PLAYBACK_DEVICE,
     .type = PCM_PLAYBACK,
     .devices = AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|
-               AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE,
+               AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_ALL_SCO,
 };
 
 static struct pcm_device_profile pcm_device_deep_buffer = {
@@ -90,7 +90,7 @@ static struct pcm_device_profile pcm_device_deep_buffer = {
     .id = SOUND_DEEP_BUFFER_DEVICE,
     .type = PCM_PLAYBACK,
     .devices = AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|
-               AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE,
+               AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_ALL_SCO,
 };
 
 static struct pcm_device_profile pcm_device_capture = {
@@ -108,7 +108,7 @@ static struct pcm_device_profile pcm_device_capture = {
     .card = SOUND_CARD,
     .id = SOUND_CAPTURE_DEVICE,
     .type = PCM_CAPTURE,
-    .devices = AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC,
+    .devices = AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
 };
 
 static struct pcm_device_profile pcm_device_capture_low_latency = {
@@ -126,53 +126,13 @@ static struct pcm_device_profile pcm_device_capture_low_latency = {
     .card = SOUND_CARD,
     .id = SOUND_CAPTURE_DEVICE,
     .type = PCM_CAPTURE_LOW_LATENCY,
-    .devices = AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC,
-};
-
-static struct pcm_device_profile pcm_device_playback_sco = {
-    .config = {
-        .channels = SCO_DEFAULT_CHANNEL_COUNT,
-        .rate = SCO_DEFAULT_SAMPLING_RATE,
-        .period_size = SCO_PERIOD_SIZE,
-        .period_count = SCO_PERIOD_COUNT,
-        .format = PCM_FORMAT_S16_LE,
-        .start_threshold = SCO_START_THRESHOLD,
-        .stop_threshold = SCO_STOP_THRESHOLD,
-        .silence_threshold = 0,
-        .avail_min = SCO_AVAILABLE_MIN,
-    },
-    .card = SOUND_CARD,
-    .id = SOUND_PLAYBACK_SCO_DEVICE,
-    .type = PCM_PLAYBACK,
-    .devices =
-            AUDIO_DEVICE_OUT_BLUETOOTH_SCO|AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET|
-            AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT,
-};
-
-static struct pcm_device_profile pcm_device_capture_sco = {
-    .config = {
-        .channels = SCO_DEFAULT_CHANNEL_COUNT,
-        .rate = SCO_DEFAULT_SAMPLING_RATE,
-        .period_size = SCO_PERIOD_SIZE,
-        .period_count = SCO_PERIOD_COUNT,
-        .format = PCM_FORMAT_S16_LE,
-        .start_threshold = CAPTURE_START_THRESHOLD,
-        .stop_threshold = 0,
-        .silence_threshold = 0,
-        .avail_min = 0,
-    },
-    .card = SOUND_CARD,
-    .id = SOUND_CAPTURE_SCO_DEVICE,
-    .type = PCM_CAPTURE,
-    .devices = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
+    .devices = AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
 };
 
 static struct pcm_device_profile * const pcm_devices[] = {
     &pcm_device_playback,
     &pcm_device_capture,
     &pcm_device_capture_low_latency,
-    &pcm_device_playback_sco,
-    &pcm_device_capture_sco,
     NULL,
 };
 
@@ -758,16 +718,11 @@ static snd_device_t get_input_snd_device(struct audio_device *adev, audio_device
 
         /* BT SCO */
         if (out_device & AUDIO_DEVICE_OUT_ALL_SCO) {
-            snd_device = SND_DEVICE_IN_VOICE_MIC;
 
-            if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {
-                if (voice_session_uses_wideband(adev->voice.session)) {
+            if (voice_session_uses_wideband(adev->voice.session)) {
                     snd_device = SND_DEVICE_IN_VOICE_BT_SCO_MIC_WB;
-                } else {
+            } else {
                     snd_device = SND_DEVICE_IN_VOICE_BT_SCO_MIC;
-                }
-            } else if (voice_session_uses_twomic(adev->voice.session)) {
-                snd_device = SND_DEVICE_IN_VOICE_EARPIECE_MIC;
             }
         }
     } else if (source == AUDIO_SOURCE_CAMCORDER) {
@@ -985,6 +940,67 @@ int disable_snd_device(struct audio_device *adev,
     return 0;
 }
 
+static void check_and_route_usecases(struct audio_device *adev,
+                                              struct audio_usecase *uc_info,
+                                              usecase_type_t type,
+                                              snd_device_t snd_device)
+{
+    struct listnode *node;
+    struct audio_usecase *usecase;
+    bool switch_device[AUDIO_USECASE_MAX], need_switch = false;
+    snd_device_t usecase_snd_device = SND_DEVICE_NONE;
+    int i;
+
+    /*
+     * This function is to make sure that all the usecases that are active on
+     * the hardware codec backend are always routed to any one device that is
+     * handled by the hardware codec.
+     * For example, if low-latency and deep-buffer usecases are currently active
+     * on speaker and out_set_parameters(headset) is received on low-latency
+     * output, then we have to make sure deep-buffer is also switched to headset or
+     * if audio-record and voice-call usecases are currently
+     * active on speaker(rx) and speaker-mic (tx) and out_set_parameters(earpiece)
+     * is received for voice call then we have to make sure that audio-record
+     * usecase is also switched to earpiece i.e.
+     * because of the limitation that both the devices cannot be enabled
+     * at the same time as they share the same backend.
+     */
+    /* Disable all the usecases on the shared backend other than the
+       specified usecase */
+    for (i = 0; i < AUDIO_USECASE_MAX; i++)
+        switch_device[i] = false;
+
+    list_for_each(node, &adev->usecase_list) {
+        usecase = node_to_item(node, struct audio_usecase, adev_list_node);
+        if (usecase->type != type || usecase == uc_info)
+            continue;
+        usecase_snd_device = (type == PCM_PLAYBACK) ? usecase->out_snd_device :
+                              usecase->in_snd_device;
+        if (usecase_snd_device != snd_device) {
+            ALOGV("%s: Usecase (%s) is active on (%s) - disabling ..",
+                  __func__, use_case_table[usecase->id],
+                  get_snd_device_name(usecase_snd_device));
+            switch_device[usecase->id] = true;
+            need_switch = true;
+        }
+    }
+    if (need_switch) {
+        list_for_each(node, &adev->usecase_list) {
+            usecase = node_to_item(node, struct audio_usecase, adev_list_node);
+            usecase_snd_device = (type == PCM_PLAYBACK) ? usecase->out_snd_device :
+                                  usecase->in_snd_device;
+            if (switch_device[usecase->id]) {
+                disable_snd_device(adev, usecase, usecase_snd_device);
+                enable_snd_device(adev, usecase, snd_device);
+                if (type == PCM_PLAYBACK)
+                    usecase->out_snd_device = snd_device;
+                else
+                    usecase->in_snd_device = snd_device;
+            }
+        }
+    }
+}
+
 static int select_devices(struct audio_device *adev,
                           audio_usecase_t uc_id)
 {
@@ -1021,11 +1037,8 @@ static int select_devices(struct audio_device *adev,
         if (vc_usecase == NULL) {
             ALOGE("%s: Could not find the voice call usecase", __func__);
         } else {
-            ALOGV("%s: in call, reusing devices (rx: %s, tx: %s)", __func__,
-                  get_snd_device_display_name(vc_usecase->out_snd_device),
-                  get_snd_device_display_name(vc_usecase->in_snd_device));
-            usecase->devices = vc_usecase->devices;
-            return 0;
+            in_snd_device = vc_usecase->in_snd_device;
+            out_snd_device = vc_usecase->out_snd_device;
         }
     }
 
@@ -1084,10 +1097,12 @@ static int select_devices(struct audio_device *adev,
             set_voice_session_audio_path(adev->voice.session);
         }
 
+        check_and_route_usecases(adev, usecase, PCM_PLAYBACK, out_snd_device);
         enable_snd_device(adev, usecase, out_snd_device);
     }
 
     if (in_snd_device != SND_DEVICE_NONE) {
+        check_and_route_usecases(adev, usecase, PCM_CAPTURE, in_snd_device);
         enable_snd_device(adev, usecase, in_snd_device);
     }
 
@@ -1106,46 +1121,6 @@ static ssize_t read_frames(struct stream_in *in, void *buffer, ssize_t frames);
 static int do_in_standby_l(struct stream_in *in);
 
 #ifdef PREPROCESSING_ENABLED
-static void get_capture_reference_delay(struct stream_in *in,
-                              size_t frames __unused,
-                              struct echo_reference_buffer *buffer)
-{
-    ALOGVV("%s: enter:)", __func__);
-
-    /* read frames available in kernel driver buffer */
-    unsigned int kernel_frames;
-    struct timespec tstamp;
-    long buf_delay;
-    long kernel_delay;
-    long delay_ns;
-    struct pcm_device *ref_device;
-    long rsmp_delay = 0;
-
-    ref_device = node_to_item(list_tail(&in->pcm_dev_list),
-                              struct pcm_device, stream_list_node);
-
-    if (pcm_get_htimestamp(ref_device->pcm, &kernel_frames, &tstamp) < 0) {
-        buffer->time_stamp.tv_sec  = 0;
-        buffer->time_stamp.tv_nsec = 0;
-        buffer->delay_ns           = 0;
-        ALOGW("read get_capture_reference_delay(): pcm_htimestamp error");
-        return;
-    }
-
-    /* adjust render time stamp with delay added by current driver buffer.
-    * Add the duration of current frame as we want the render time of the last
-    * sample being written. */
-
-    kernel_delay = (long)(((int64_t)kernel_frames * 1000000000) / ref_device->pcm_profile->config.rate);
-
-    buffer->time_stamp = tstamp;
-    buffer->delay_ns = kernel_delay;
-
-    ALOGVV("get_capture_reference_delay_time_stamp Secs: [%10ld], nSecs: [%9ld], kernel_frames: [%5d],"
-          " delay_ns: [%d] , frames:[%zd]",
-           buffer->time_stamp.tv_sec , buffer->time_stamp.tv_nsec, kernel_frames, buffer->delay_ns, frames);
-}
-
 static void get_capture_delay(struct stream_in *in,
                               size_t frames __unused,
                               struct echo_reference_buffer *buffer)
@@ -1206,6 +1181,11 @@ static int32_t update_echo_reference(struct stream_in *in, size_t frames)
     b.delay_ns = 0;
     struct pcm_device *pcm_device;
 
+    if (list_empty(&in->pcm_dev_list)) {
+        ALOGW("%s: pcm device list empty", __func__);
+        return b.delay_ns;
+    }
+
     pcm_device = node_to_item(list_head(&in->pcm_dev_list),
                               struct pcm_device, stream_list_node);
 
@@ -1242,12 +1222,13 @@ static int set_preprocessor_param(effect_handle_t handle,
                            effect_param_t *param)
 {
     uint32_t size = sizeof(int);
-    uint32_t psize = ((param->psize - 1) / sizeof(int) + 1) * sizeof(int) +
-                        param->vsize;
+    uint32_t bufsize = sizeof(effect_param_t) +
+        ((param->psize - 1) / sizeof(int) + 1) * sizeof(int) +
+        param->vsize;
 
     int status = (*handle)->command(handle,
                                    EFFECT_CMD_SET_PARAM,
-                                   sizeof (effect_param_t) + psize,
+                                   bufsize,
                                    param,
                                    &size,
                                    &param->status);
@@ -1260,19 +1241,27 @@ static int set_preprocessor_param(effect_handle_t handle,
 static int set_preprocessor_echo_delay(effect_handle_t handle,
                                      int32_t delay_us)
 {
-    struct {
-        effect_param_t  param;
-        uint32_t        data_0;
-        int32_t         data_1;
-    } buf;
-    memset(&buf, 0, sizeof(buf));
+    const uint32_t param_size = sizeof(uint32_t);
+    const uint32_t value_size = sizeof(uint32_t);
+
+    const uint32_t param_padded_size =
+        ((param_size - 1) / sizeof(int) + 1) * sizeof(int);
 
-    buf.param.psize = sizeof(uint32_t);
-    buf.param.vsize = sizeof(uint32_t);
-    buf.data_0 = AEC_PARAM_ECHO_DELAY;
-    buf.data_1 = delay_us;
+    const uint32_t bufsize = sizeof(effect_param_t) +
+        param_padded_size + value_size;
 
-    return set_preprocessor_param(handle, &buf.param);
+    uint8_t buf[bufsize];
+    memset(&buf, 0, bufsize);
+
+    effect_param_t *effect_param = (effect_param_t *)&buf;
+
+    effect_param->psize = param_size;
+    effect_param->vsize = value_size;
+
+    *(uint32_t *)&buf[sizeof(effect_param_t)] = AEC_PARAM_ECHO_DELAY;
+    *(int32_t *)&buf[sizeof(effect_param_t) + param_padded_size] = delay_us;
+
+    return set_preprocessor_param(handle, effect_param);
 }
 
 static void push_echo_reference(struct stream_in *in, size_t frames)
@@ -1282,7 +1271,6 @@ static void push_echo_reference(struct stream_in *in, size_t frames)
      * in->ref_buf_frames is updated with frames available in in->ref_buf */
 
     int32_t delay_us = update_echo_reference(in, frames)/1000;
-    int32_t size_in_bytes = 0;
     int i;
     audio_buffer_t buf;
 
@@ -1375,7 +1363,6 @@ static int get_playback_delay(struct stream_out *out,
 {
     unsigned int kernel_frames;
     int status;
-    int primary_pcm = 0;
     struct pcm_device *pcm_device;
 
     pcm_device = node_to_item(list_head(&out->pcm_dev_list),
@@ -2121,11 +2108,6 @@ static int start_input_stream(struct stream_in *in)
 
 #endif
 
-    if (in->dev->voice.in_call) {
-        ALOGV("%s: in_call, not handling PCMs", __func__);
-        goto skip_pcm_handling;
-    }
-
     /* Open the PCM device.
      * The HW is limited to support only the default pcm_profile settings.
      * As such a change in aux_channels will not have an effect.
@@ -2146,7 +2128,6 @@ static int start_input_stream(struct stream_in *in)
         goto error_open;
     }
 
-skip_pcm_handling:
     /* force read and proc buffer reallocation in case of frame size or
      * channel count change */
     in->proc_buf_frames = 0;
@@ -2247,14 +2228,6 @@ static int out_close_pcm_devices(struct stream_out *out)
             pcm_close(pcm_device->pcm);
             pcm_device->pcm = NULL;
         }
-        if (pcm_device->resampler) {
-            release_resampler(pcm_device->resampler);
-            pcm_device->resampler = NULL;
-        }
-        if (pcm_device->res_buffer) {
-            free(pcm_device->res_buffer);
-            pcm_device->res_buffer = NULL;
-        }
     }
 
     return 0;
@@ -2276,11 +2249,6 @@ static int out_open_pcm_devices(struct stream_out *out)
         if (out->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER)
             pcm_device_id = pcm_device_deep_buffer.id;
 
-        if (out->dev->voice.in_call) {
-            ALOGV("%s: in_call, not opening PCMs", __func__);
-            return ret;
-        }
-
         ALOGV("%s: Opening PCM device card_id(%d) device_id(%d)",
               __func__, pcm_device_card, pcm_device_id);
 
@@ -2293,24 +2261,6 @@ static int out_open_pcm_devices(struct stream_out *out)
             ret = -EIO;
             goto error_open;
         }
-        /*
-        * If the stream rate differs from the PCM rate, we need to
-        * create a resampler.
-        */
-        if (out->sample_rate != pcm_device->pcm_profile->config.rate) {
-            ALOGV("%s: create_resampler(), pcm_device_card(%d), pcm_device_id(%d), \
-                    out_rate(%d), device_rate(%d)",__func__,
-                    pcm_device_card, pcm_device_id,
-                    out->sample_rate, pcm_device->pcm_profile->config.rate);
-            ret = create_resampler(out->sample_rate,
-                    pcm_device->pcm_profile->config.rate,
-                    audio_channel_count_from_out_mask(out->channel_mask),
-                    RESAMPLER_QUALITY_DEFAULT,
-                    NULL,
-                    &pcm_device->resampler);
-            pcm_device->res_byte_count = 0;
-            pcm_device->res_buffer = NULL;
-        }
     }
     return ret;
 
@@ -2707,11 +2657,6 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
         }
 #endif
         if (val != SND_DEVICE_NONE) {
-            bool bt_sco_active = false;
-
-            if (out->devices & AUDIO_DEVICE_OUT_ALL_SCO) {
-                bt_sco_active = true;
-            }
             out->devices = val;
 
             if (!out->standby) {
@@ -2738,17 +2683,23 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
                 }
             }
 
+            /* Turn on bluetooth sco if needed */
+            if ((adev->mode == AUDIO_MODE_IN_COMMUNICATION || adev->mode == AUDIO_MODE_IN_CALL) &&
+                (out->devices & AUDIO_DEVICE_OUT_ALL_SCO) && !adev->bt_sco_active) {
+                adev->bt_sco_active = true;
+                start_voice_session_bt_sco(adev);
+            }
+            else if (!(out->devices & AUDIO_DEVICE_OUT_ALL_SCO) && adev->bt_sco_active) {
+                adev->bt_sco_active = false;
+                stop_voice_session_bt_sco(adev);
+            }
+
             if ((adev->mode == AUDIO_MODE_IN_CALL) && !adev->voice.in_call &&
                     (out == adev->primary_output)) {
                 start_voice_call(adev);
             } else if ((adev->mode == AUDIO_MODE_IN_CALL) &&
                        adev->voice.in_call &&
                        (out == adev->primary_output)) {
-                /* Turn on bluetooth if needed */
-                if ((out->devices & AUDIO_DEVICE_OUT_ALL_SCO) && !bt_sco_active) {
-                    select_devices(adev, USECASE_VOICE_CALL);
-                    start_voice_session_bt_sco(adev->voice.session);
-                } else {
                     /*
                      * When we select different devices we need to restart the
                      * voice call. The modem closes the stream on its end and
@@ -2756,7 +2707,6 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
                      */
                     stop_voice_call(adev);
                     start_voice_call(adev);
-                }
             }
         }
 
@@ -2889,9 +2839,8 @@ static ssize_t out_write(struct audio_stream_out *stream, const void *buffer,
     ssize_t ret = 0;
     struct pcm_device *pcm_device;
     struct listnode *node;
-    size_t frame_size = audio_stream_out_frame_size(stream);
-    size_t frames_wr = 0, frames_rq = 0;
 #ifdef PREPROCESSING_ENABLED
+    size_t frame_size = audio_stream_out_frame_size(stream);
     size_t in_frames = bytes / frame_size;
     size_t out_frames = in_frames;
     struct stream_in *in = NULL;
@@ -2987,24 +2936,6 @@ static ssize_t out_write(struct audio_stream_out *stream, const void *buffer,
             memset((void *)buffer, 0, bytes);
         list_for_each(node, &out->pcm_dev_list) {
             pcm_device = node_to_item(node, struct pcm_device, stream_list_node);
-            if (pcm_device->resampler) {
-                if (bytes * pcm_device->pcm_profile->config.rate / out->sample_rate + frame_size
-                        > pcm_device->res_byte_count) {
-                    pcm_device->res_byte_count =
-                        bytes * pcm_device->pcm_profile->config.rate / out->sample_rate + frame_size;
-                    pcm_device->res_buffer =
-                        realloc(pcm_device->res_buffer, pcm_device->res_byte_count);
-                    ALOGV("%s: resampler res_byte_count = %zu", __func__,
-                        pcm_device->res_byte_count);
-                }
-                frames_rq = bytes / frame_size;
-                frames_wr = pcm_device->res_byte_count / frame_size;
-                ALOGVV("%s: resampler request frames = %d frame_size = %d",
-                    __func__, frames_rq, frame_size);
-                pcm_device->resampler->resample_from_input(pcm_device->resampler,
-                    (int16_t *)buffer, &frames_rq, (int16_t *)pcm_device->res_buffer, &frames_wr);
-                ALOGVV("%s: resampler output frames_= %d", __func__, frames_wr);
-            }
             if (pcm_device->pcm) {
 #ifdef PREPROCESSING_ENABLED
                 if (out->echo_reference != NULL && pcm_device->pcm_profile->devices != SND_DEVICE_OUT_SPEAKER) {
@@ -3017,12 +2948,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void *buffer,
                  }
 #endif
                 ALOGVV("%s: writing buffer (%d bytes) to pcm device", __func__, bytes);
-                if (pcm_device->resampler && pcm_device->res_buffer)
-                    pcm_device->status =
-                        pcm_write(pcm_device->pcm, (void *)pcm_device->res_buffer,
-                            frames_wr * frame_size);
-                else
-                    pcm_device->status = pcm_write(pcm_device->pcm, (void *)buffer, bytes);
+                pcm_device->status = pcm_write(pcm_device->pcm, (void *)buffer, bytes);
                 if (pcm_device->status != 0)
                     ret = pcm_device->status;
             }
@@ -3126,12 +3052,6 @@ static int out_get_presentation_position(const struct audio_stream_out *stream,
     if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {
         ret = out_get_presentation_offload_position(out, frames, timestamp);
     } else {
-        if (out->dev->voice.in_call) {
-            ALOGVV("%s: in_call, do not handle PCMs", __func__);
-            ret = 0;
-            goto done;
-        }
-
         /* FIXME: which device to read from? */
         if (!list_empty(&out->pcm_dev_list)) {
             struct pcm_device *pcm_device;
@@ -3570,6 +3490,11 @@ static int in_get_capture_position(const struct audio_stream_in *stream,
     struct pcm_device *pcm_device;
     int ret = -ENOSYS;
 
+    if (list_empty(&in->pcm_dev_list)) {
+        ALOGW("%s: pcm device list empty", __func__);
+        return -ENODEV;
+    }
+
     pcm_device = node_to_item(list_head(&in->pcm_dev_list),
                               struct pcm_device, stream_list_node);
 
@@ -4330,6 +4255,8 @@ static int adev_open(const hw_module_t *module, const char *name,
     adev->voice.in_call = false;
     adev->voice.bluetooth_wb = false;
 
+    adev->bt_sco_active = false;
+
     /* adev->cur_hdmi_channels = 0;  by calloc() */
     adev->snd_dev_ref_cnt = calloc(SND_DEVICE_MAX, sizeof(int));
     if (adev->snd_dev_ref_cnt == NULL) {
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index 4677f298f..7143d555b 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -240,10 +240,6 @@ struct pcm_device {
     struct pcm_device_profile* pcm_profile;
     struct pcm*                pcm;
     int                        status;
-    /* TODO: remove resampler if possible when AudioFlinger supports downsampling from 48 to 8 */
-    struct resampler_itfe*     resampler;
-    int16_t*                   res_buffer;
-    size_t                     res_byte_count;
 };
 
 struct stream_out {
@@ -372,7 +368,7 @@ struct voice_data {
     float volume;
     bool  bluetooth_nrec;
     bool  bluetooth_wb;
-    void  *session;
+    struct voice_session *session;
 };
 
 struct audio_device {
@@ -385,6 +381,10 @@ struct audio_device {
     bool                    mic_mute;
     bool                    screen_off;
 
+    bool                    bt_sco_active;
+    struct pcm              *pcm_sco_rx;
+    struct pcm              *pcm_sco_tx;
+
     struct voice_data       voice;
 
     int*                    snd_dev_ref_cnt;
diff --git a/audio/compress_offload.c b/audio/compress_offload.c
index 5ce865eb1..fccc7db49 100644
--- a/audio/compress_offload.c
+++ b/audio/compress_offload.c
@@ -291,12 +291,6 @@ ssize_t out_write_offload(struct audio_stream_out *stream, const void *buffer,
         out->offload_state = OFFLOAD_STATE_PLAYING;
     }
     pthread_mutex_unlock(&out->lock);
-#ifdef PREPROCESSING_ENABLED
-    if (in) {
-        /* This mutex was left locked iff in != NULL */
-        pthread_mutex_unlock(&adev->lock_inputs);
-    }
-#endif
 
     return ret;
 }
diff --git a/audio/voice.c b/audio/voice.c
index a4b654256..6d5e61303 100644
--- a/audio/voice.c
+++ b/audio/voice.c
@@ -38,17 +38,6 @@
 #include "audience.h"
 #endif
 
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr:    the pointer to the member.
- * @type:   the type of the container struct this is embedded in.
- * @member: the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({              \
-    void *__mptr = (void *)(ptr);                   \
-    ((type *)((uintptr_t)__mptr - offsetof(type, member))); })
-
 static struct pcm_config pcm_config_voicecall = {
     .channels = 2,
     .rate = 8000,
@@ -73,10 +62,9 @@ struct pcm_config pcm_config_voice_sco = {
     .format = PCM_FORMAT_S16_LE,
 };
 
-/* SCO WB and NB uses 8kHz for now, 16kHz it's on TO DO*/
 struct pcm_config pcm_config_voice_sco_wb = {
     .channels = 1,
-    .rate = SCO_DEFAULT_SAMPLING_RATE,
+    .rate = SCO_WB_SAMPLING_RATE,
     .period_size = SCO_PERIOD_SIZE,
     .period_count = SCO_PERIOD_COUNT,
     .format = PCM_FORMAT_S16_LE,
@@ -151,36 +139,39 @@ void prepare_voice_session(struct voice_session *session,
  * This must be called with the hw device mutex locked, OK to hold other
  * mutexes.
  */
-static void stop_voice_session_bt_sco(struct voice_session *session) {
+void stop_voice_session_bt_sco(struct audio_device *adev) {
     ALOGV("%s: Closing SCO PCMs", __func__);
 
-    if (session->pcm_sco_rx != NULL) {
-        pcm_stop(session->pcm_sco_rx);
-        pcm_close(session->pcm_sco_rx);
-        session->pcm_sco_rx = NULL;
+    if (adev->pcm_sco_rx != NULL) {
+        pcm_stop(adev->pcm_sco_rx);
+        pcm_close(adev->pcm_sco_rx);
+        adev->pcm_sco_rx = NULL;
     }
 
-    if (session->pcm_sco_tx != NULL) {
-        pcm_stop(session->pcm_sco_tx);
-        pcm_close(session->pcm_sco_tx);
-        session->pcm_sco_tx = NULL;
+    if (adev->pcm_sco_tx != NULL) {
+        pcm_stop(adev->pcm_sco_tx);
+        pcm_close(adev->pcm_sco_tx);
+        adev->pcm_sco_tx = NULL;
     }
+
+    /* audio codecs like wm5201 need open modem pcm while using bt sco */
+    if (adev->mode != AUDIO_MODE_IN_CALL)
+        stop_voice_session(adev->voice.session);
 }
 
 /* must be called with the hw device mutex locked, OK to hold other mutexes */
-void start_voice_session_bt_sco(struct voice_session *session)
+void start_voice_session_bt_sco(struct audio_device *adev)
 {
     struct pcm_config *voice_sco_config;
-    struct voice_data *vdata = container_of(session, struct voice_data, session);
 
-    if (session->pcm_sco_rx != NULL || session->pcm_sco_tx != NULL) {
+    if (adev->pcm_sco_rx != NULL || adev->pcm_sco_tx != NULL) {
         ALOGW("%s: SCO PCMs already open!\n", __func__);
         return;
     }
 
     ALOGV("%s: Opening SCO PCMs", __func__);
 
-    if (vdata->bluetooth_wb) {
+    if (adev->voice.bluetooth_wb) {
         ALOGV("%s: pcm_config wideband", __func__);
         voice_sco_config = &pcm_config_voice_sco_wb;
     } else {
@@ -188,37 +179,41 @@ void start_voice_session_bt_sco(struct voice_session *session)
         voice_sco_config = &pcm_config_voice_sco;
     }
 
-    session->pcm_sco_rx = pcm_open(SOUND_CARD,
+    adev->pcm_sco_rx = pcm_open(SOUND_CARD,
                                    SOUND_PLAYBACK_SCO_DEVICE,
                                    PCM_OUT|PCM_MONOTONIC,
                                    voice_sco_config);
-    if (session->pcm_sco_rx != NULL && !pcm_is_ready(session->pcm_sco_rx)) {
+    if (adev->pcm_sco_rx != NULL && !pcm_is_ready(adev->pcm_sco_rx)) {
         ALOGE("%s: cannot open PCM SCO RX stream: %s",
-              __func__, pcm_get_error(session->pcm_sco_rx));
+              __func__, pcm_get_error(adev->pcm_sco_rx));
         goto err_sco_rx;
     }
 
-    session->pcm_sco_tx = pcm_open(SOUND_CARD,
+    adev->pcm_sco_tx = pcm_open(SOUND_CARD,
                                    SOUND_CAPTURE_SCO_DEVICE,
                                    PCM_IN|PCM_MONOTONIC,
                                    voice_sco_config);
-    if (session->pcm_sco_tx && !pcm_is_ready(session->pcm_sco_tx)) {
+    if (adev->pcm_sco_tx && !pcm_is_ready(adev->pcm_sco_tx)) {
         ALOGE("%s: cannot open PCM SCO TX stream: %s",
-              __func__, pcm_get_error(session->pcm_sco_tx));
+              __func__, pcm_get_error(adev->pcm_sco_tx));
         goto err_sco_tx;
     }
 
-    pcm_start(session->pcm_sco_rx);
-    pcm_start(session->pcm_sco_tx);
+    pcm_start(adev->pcm_sco_rx);
+    pcm_start(adev->pcm_sco_tx);
+
+    /* audio codecs like wm5201 need open modem pcm while using bt sco */
+    if (adev->mode != AUDIO_MODE_IN_CALL)
+        start_voice_session(adev->voice.session);
 
     return;
 
 err_sco_tx:
-    pcm_close(session->pcm_sco_tx);
-    session->pcm_sco_tx = NULL;
+    pcm_close(adev->pcm_sco_tx);
+    adev->pcm_sco_tx = NULL;
 err_sco_rx:
-    pcm_close(session->pcm_sco_rx);
-    session->pcm_sco_rx = NULL;
+    pcm_close(adev->pcm_sco_rx);
+    adev->pcm_sco_rx = NULL;
 }
 /*
  * This function must be called with hw device mutex locked, OK to hold other
@@ -278,10 +273,6 @@ int start_voice_session(struct voice_session *session)
     pcm_start(session->pcm_voice_rx);
     pcm_start(session->pcm_voice_tx);
 
-    if (session->out_device & AUDIO_DEVICE_OUT_ALL_SCO) {
-        start_voice_session_bt_sco(session);
-    }
-
 #ifdef AUDIENCE_EARSMART_IC
     ALOGV("%s: Enabling Audience IC", __func__);
     es_start_voice_session(session);
@@ -295,8 +286,6 @@ int start_voice_session(struct voice_session *session)
         ril_set_two_mic_control(&session->ril, AUDIENCE, TWO_MIC_SOLUTION_OFF);
     }
 
-    ril_set_call_clock_sync(&session->ril, SOUND_CLOCK_START);
-
     return 0;
 }
 
@@ -308,6 +297,8 @@ void stop_voice_session(struct voice_session *session)
 {
     int status = 0;
 
+    ril_set_call_clock_sync(&session->ril, SOUND_CLOCK_STOP);
+
     ALOGV("%s: Closing active PCMs", __func__);
 
     if (session->pcm_voice_rx != NULL) {
@@ -324,10 +315,6 @@ void stop_voice_session(struct voice_session *session)
         status++;
     }
 
-    if (session->out_device & AUDIO_DEVICE_OUT_ALL_SCO) {
-        stop_voice_session_bt_sco(session);
-    }
-
 #ifdef AUDIENCE_EARSMART_IC
     ALOGV("%s: Disabling Audience IC", __func__);
     es_stop_voice_session();
@@ -384,10 +371,8 @@ bool voice_session_uses_twomic(struct voice_session *session)
 
 bool voice_session_uses_wideband(struct voice_session *session)
 {
-    struct voice_data *vdata = container_of(session, struct voice_data, session);
-
     if (session->out_device & AUDIO_DEVICE_OUT_ALL_SCO) {
-        return vdata->bluetooth_wb;
+        return session->vdata->bluetooth_wb;
     }
 
     return session->wb_amr_type >= 1;
@@ -474,6 +459,8 @@ struct voice_session *voice_session_init(struct audio_device *adev)
         }
     }
 
+    session->vdata = &adev->voice;
+
     return session;
 }
 
diff --git a/audio/voice.h b/audio/voice.h
index 630221ff9..c5cc2f546 100644
--- a/audio/voice.h
+++ b/audio/voice.h
@@ -25,15 +25,15 @@ struct voice_session {
     struct pcm *pcm_voice_rx;
     struct pcm *pcm_voice_tx;
 
-    struct pcm *pcm_sco_rx;
-    struct pcm *pcm_sco_tx;
-
     int wb_amr_type;
     bool two_mic_control;
     bool two_mic_disabled;
 
     /* from uc_info */
     audio_devices_t out_device;
+
+    /* parent container */
+    struct voice_data *vdata;
 };
 
 void prepare_voice_session(struct voice_session *session,
@@ -44,7 +44,8 @@ void set_voice_session_volume(struct voice_session *session, float volume);
 void set_voice_session_audio_path(struct voice_session *session);
 void set_voice_session_mic_mute(struct voice_session *session, bool state);
 
-void start_voice_session_bt_sco(struct voice_session *session);
+void start_voice_session_bt_sco(struct audio_device *adev);
+void stop_voice_session_bt_sco(struct audio_device *adev);
 
 bool voice_session_uses_twomic(struct voice_session *session);
 bool voice_session_uses_wideband(struct voice_session *session);
diff --git a/dtbhtool/dtbimg.c b/dtbhtool/dtbimg.c
index 744222fe0..cddcd29ed 100644
--- a/dtbhtool/dtbimg.c
+++ b/dtbhtool/dtbimg.c
@@ -126,6 +126,7 @@ void *load_dtbh_block(const char *dtb_path, unsigned pagesize, unsigned *_sz)
     uint32_t version = DTBH_VERSION;
     unsigned blob_sz = 0;
     char fname[PATH_MAX];
+    const unsigned *model;
     const unsigned *prop_chip;
     const unsigned *prop_platform;
     const unsigned *prop_subtype;
@@ -161,6 +162,17 @@ void *load_dtbh_block(const char *dtb_path, unsigned pagesize, unsigned *_sz)
         }
 
         offset = fdt_path_offset(dtb, "/");
+
+#ifdef DTBH_MODEL
+        model = fdt_getprop(dtb, offset, "model", &len);
+        if (strstr((char *)&model[0], DTBH_MODEL) == NULL) {
+            warnx("model of %s is invalid, skipping (expected *%s* but got %s)",
+                  fname, DTBH_MODEL, (char *)&model[0]);
+            free(dtb);
+            continue;
+        }
+#endif
+
         prop_chip = fdt_getprop(dtb, offset, "model_info-chip", &len);
         if (len % (sizeof(uint32_t)) != 0) {
             warnx("model_info-chip of %s is of invalid size, skipping", fname);
diff --git a/macloader/macaddr_mappings.h b/macloader/macaddr_mappings.h
index b037b73a9..13ef54f87 100644
--- a/macloader/macaddr_mappings.h
+++ b/macloader/macaddr_mappings.h
@@ -48,9 +48,11 @@ static const struct company_range murata_ranges = {
         "00:26:e8",
         "00:37:6d",
         "00:60:57",
+        "00:9d:6b",
         "00:ae:fa",
         "04:46:65",
         "10:5f:06",
+        "10:98:c3",
         "10:a5:d0",
         "10:d5:42",
         "14:7d:c5",
@@ -76,6 +78,7 @@ static const struct company_range murata_ranges = {
         "b0:72:bf",
         "b8:d7:af",
         "c8:14:79",
+        "cc:c0:79",
         "d0:e4:4a",
         "d8:c4:6a",
         "dc:ef:ca",
@@ -91,6 +94,7 @@ static const struct company_range semcosh_ranges = {
         "34:23:ba",
         "38:aa:3c",
         "5c:0a:5b",
+        "6c:c7:ec",
         "88:32:9b",
         "90:18:7c",
         "cc:3a:61"
@@ -101,7 +105,10 @@ static const struct company_range semco3rd_ranges = {
     .type = SEMCO3RD,
     .macaddrs = {
         "04:d6:aa",
+        "08:c5:e1",
+        "24:18:1d",
         "2c:0e:3d",
+        "30:07:4d",
         "54:88:0e",
         "84:38:38",
         "8c:f5:a3",
@@ -124,12 +131,17 @@ static const struct company_range semco3rd_ranges = {
 static const struct company_range semco_ranges = {
     .type = SEMCO,
     .macaddrs = {
+        "48:13:7e",
         "4c:66:41",
         "51:f6:6b",
+        "94:76:b7",
+        "a4:84:31",
         "cc:07:ab",
         "d8:c4:e9",
+        "e8:3a:12",
         "ec:9b:f3",
-        "f0:25:b7"
+        "f0:25:b7",
+        "f8:e6:1a"
     }
 };
 
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index a7384f13c..d794f027a 100644
--- a/ril/libril/ril.cpp
+++ b/ril/libril/ril.cpp
@@ -1016,7 +1016,7 @@ failCauseToString(RIL_Errno e) {
         case RIL_E_SIM_FULL: return "E_SIM_FULL";
         case RIL_E_NETWORK_REJECT: return "E_NETWORK_REJECT";
         case RIL_E_OPERATION_NOT_ALLOWED: return "E_OPERATION_NOT_ALLOWED";
-        case RIL_E_EMPTY_RECORD: "E_EMPTY_RECORD";
+        case RIL_E_EMPTY_RECORD: return "E_EMPTY_RECORD";
         case RIL_E_INVALID_SMS_FORMAT: return "E_INVALID_SMS_FORMAT";
         case RIL_E_ENCODING_ERR: return "E_ENCODING_ERR";
         case RIL_E_INVALID_SMSC_ADDRESS: return "E_INVALID_SMSC_ADDRESS";