diff --git a/cm/res/res/values-am/strings.xml b/cm/res/res/values-am/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-am/strings.xml
+++ b/cm/res/res/values-am/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-be/strings.xml b/cm/res/res/values-be/strings.xml
index e9171df..63ab76e 100644
--- a/cm/res/res/values-be/strings.xml
+++ b/cm/res/res/values-be/strings.xml
@@ -38,7 +38,7 @@
   <string name="permdesc_modifyProfiles">Дазваляць дадаткам змяняць сістэмныя профілі.</string>
   <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
   <string name="permlab_useHardwareFramework">Узаемадзеянне з абсталяваннем</string>
-  <string name="permdesc_useHardwareFramework">Дадатак зможа атрымваць доступ да падсістэмы апаратных абстракцый LineageOS.</string>
+  <string name="permdesc_useHardwareFramework">Дадатак зможа атрымваць доступ да падсістэмы апаратных абстракцый CyanogenMod.</string>
   <!-- Labels for the WRITE_ALARMS permission. -->
   <string name="permlab_write_alarms">змена будзільнікаў</string>
   <string name="permdesc_write_alarms">Дадатак зможа дадаваць, змяняць ці выдаляць любыя будзільнікі.</string>
diff --git a/cm/res/res/values-bn-rBD/strings.xml b/cm/res/res/values-bn-rBD/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-bn-rBD/strings.xml
+++ b/cm/res/res/values-bn-rBD/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-br-rFR/strings.xml b/cm/res/res/values-br-rFR/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-br-rFR/strings.xml
+++ b/cm/res/res/values-br-rFR/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-bs-rBA/strings.xml b/cm/res/res/values-bs-rBA/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-bs-rBA/strings.xml
+++ b/cm/res/res/values-bs-rBA/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-cs/strings.xml b/cm/res/res/values-cs/strings.xml
index ee59870..aee73ac 100644
--- a/cm/res/res/values-cs/strings.xml
+++ b/cm/res/res/values-cs/strings.xml
@@ -50,10 +50,10 @@
   <string name="permdesc_read_alarms">Umožní číst naplánované budíky.</string>
   <!-- Labels for the WRITE_SETTINGS permission -->
   <string name="permlab_writeSettings">změnit CM systémové nastavení</string>
-  <string name="permdesc_writeSettings">Umožní měnit systémové nastavení LineageOS.</string>
+  <string name="permdesc_writeSettings">Umožní měnit systémové nastavení CyanogenMod.</string>
   <!-- Labels for the WRITE_SECURE_SETTINGS permission -->
   <string name="permlab_writeSecureSettings">upravit nastavení zabezpečení systému CM</string>
-  <string name="permdesc_writeSecureSettings">Umožní změnit nastavení zabezpečení systému LineageOS. Není určeno pro normální aplikace.</string>
+  <string name="permdesc_writeSecureSettings">Umožní změnit nastavení zabezpečení systému CyanogenMod. Není určeno pro normální aplikace.</string>
   <!-- Labels for the MANAGE_PERSISTENT_STORAGE permission. -->
   <string name="permlab_managePersistentStorage">spravovat trvalé úložiště</string>
   <string name="permdesc_managePersistentStorage">Umožňuje číst a zapisovat vlastnosti, které mohou přetrvat při tovární obnově.</string>
diff --git a/cm/res/res/values-csb-rPL/strings.xml b/cm/res/res/values-csb-rPL/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-csb-rPL/strings.xml
+++ b/cm/res/res/values-csb-rPL/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-cy/strings.xml b/cm/res/res/values-cy/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-cy/strings.xml
+++ b/cm/res/res/values-cy/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-de/strings.xml b/cm/res/res/values-de/strings.xml
index 68107de..23ae07b 100644
--- a/cm/res/res/values-de/strings.xml
+++ b/cm/res/res/values-de/strings.xml
@@ -157,11 +157,11 @@
   <string name="permdesc_accessLiveLockScreenServiceProvider">Ermöglicht einer App, auf den Verwaltungsdienst der animierten Bildschirmsperre zuzugreifen.</string>
   <!-- Weather Service strings -->
   <string name="permlab_weather_read">Wetter auslesen</string>
-  <string name="permdesc_weather_read">Ermöglicht einer App, Inhalte des Wetteranbieters auszulesen.</string>
-  <string name="permlab_weather_write">Wetteranbieter aktualisieren</string>
-  <string name="permdesc_weather_write">Ermöglicht einer App, Inhalte des Wetteranbieters zu aktualisieren.</string>
-  <string name="permlab_weather_bind">Anbindung an einen Service für Wetteranbieter</string>
-  <string name="permdesc_weather_bind">Ermöglicht der App, sich als Wetteranbieterdienst zu identifizieren.</string>
+  <string name="permdesc_weather_read">Ermöglicht einer App, Inhalte des Wetterdatenanbieters auszulesen.</string>
+  <string name="permlab_weather_write">Wetterdatenanbieter aktualisieren</string>
+  <string name="permdesc_weather_write">Ermöglicht einer App, Inhalte des Wetterdatenanbieters zu aktualisieren.</string>
+  <string name="permlab_weather_bind">Anbindung als Service für Wetterdatenanbieter</string>
+  <string name="permdesc_weather_bind">Ermöglicht der App, sich als Wetterdatenanbieter zu identifizieren.</string>
   <string name="permlab_weather_access_mgr">auf Wetterdienst zugreifen</string>
   <string name="permdesc_weather_access_mgr">Ermöglicht der App, auf den Wetterdienst des Systems zuzugreifen. Wird für normale Apps nicht benötigt.</string>
   <!-- DataUsageProvider write permission title -->
diff --git a/cm/res/res/values-en-rAU/strings.xml b/cm/res/res/values-en-rAU/strings.xml
index c27a401..f0af8e4 100644
--- a/cm/res/res/values-en-rAU/strings.xml
+++ b/cm/res/res/values-en-rAU/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-en-rGB/strings.xml b/cm/res/res/values-en-rGB/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-en-rGB/strings.xml
+++ b/cm/res/res/values-en-rGB/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-en-rPT/strings.xml b/cm/res/res/values-en-rPT/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-en-rPT/strings.xml
+++ b/cm/res/res/values-en-rPT/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-eo/strings.xml b/cm/res/res/values-eo/strings.xml
index e2d3a32..de4b1d6 100644
--- a/cm/res/res/values-eo/strings.xml
+++ b/cm/res/res/values-eo/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-es-rCO/strings.xml b/cm/res/res/values-es-rCO/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-es-rCO/strings.xml
+++ b/cm/res/res/values-es-rCO/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-es-rMX/strings.xml b/cm/res/res/values-es-rMX/strings.xml
index d82f7d0..30da2bc 100644
--- a/cm/res/res/values-es-rMX/strings.xml
+++ b/cm/res/res/values-es-rMX/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-fa/strings.xml b/cm/res/res/values-fa/strings.xml
index f4aba99..5e400f1 100644
--- a/cm/res/res/values-fa/strings.xml
+++ b/cm/res/res/values-fa/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <string name="cyanogenmod_system_label">سیستم سایانوژن‌مود</string>
   <string name="permlab_publishCustomTile">ایجاد کاشی سفارشی در پنل تنظیمات سریع</string>
   <string name="permdesc_publishCustomTile">به برنامه اجازه می‌دهد یک کاشی در تنظیمات سریع ایجاد کند.</string>
diff --git a/cm/res/res/values-fil-rPH/strings.xml b/cm/res/res/values-fil-rPH/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-fil-rPH/strings.xml
+++ b/cm/res/res/values-fil-rPH/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-fr-rCA/strings.xml b/cm/res/res/values-fr-rCA/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-fr-rCA/strings.xml
+++ b/cm/res/res/values-fr-rCA/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-frp-rIT/strings.xml b/cm/res/res/values-frp-rIT/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-frp-rIT/strings.xml
+++ b/cm/res/res/values-frp-rIT/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-fy-rNL/strings.xml b/cm/res/res/values-fy-rNL/strings.xml
index 0f18909..8ffaf6b 100644
--- a/cm/res/res/values-fy-rNL/strings.xml
+++ b/cm/res/res/values-fy-rNL/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-ga-rIE/strings.xml b/cm/res/res/values-ga-rIE/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-ga-rIE/strings.xml
+++ b/cm/res/res/values-ga-rIE/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-gd-rGB/strings.xml b/cm/res/res/values-gd-rGB/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-gd-rGB/strings.xml
+++ b/cm/res/res/values-gd-rGB/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-hi/strings.xml b/cm/res/res/values-hi/strings.xml
index 9395341..c113acc 100644
--- a/cm/res/res/values-hi/strings.xml
+++ b/cm/res/res/values-hi/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-hy-rAM/strings.xml b/cm/res/res/values-hy-rAM/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-hy-rAM/strings.xml
+++ b/cm/res/res/values-hy-rAM/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-is-rIS/strings.xml b/cm/res/res/values-is-rIS/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-is-rIS/strings.xml
+++ b/cm/res/res/values-is-rIS/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-ka-rGE/strings.xml b/cm/res/res/values-ka-rGE/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-ka-rGE/strings.xml
+++ b/cm/res/res/values-ka-rGE/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-kk-rKZ/strings.xml b/cm/res/res/values-kk-rKZ/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-kk-rKZ/strings.xml
+++ b/cm/res/res/values-kk-rKZ/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-km-rKH/strings.xml b/cm/res/res/values-km-rKH/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-km-rKH/strings.xml
+++ b/cm/res/res/values-km-rKH/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-ku/strings.xml b/cm/res/res/values-ku/strings.xml
index b0f0d9a..1acb639 100644
--- a/cm/res/res/values-ku/strings.xml
+++ b/cm/res/res/values-ku/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <string name="cyanogenmod_system_label">سیستەمی ساینەجنمۆد</string>
   <string name="permlab_bindCustomTileListenerService">گرێدانی دروستکراو لە خزمەتگوزاری گوێگر</string>
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
diff --git a/cm/res/res/values-ky-rKG/strings.xml b/cm/res/res/values-ky-rKG/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-ky-rKG/strings.xml
+++ b/cm/res/res/values-ky-rKG/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-lo-rLA/strings.xml b/cm/res/res/values-lo-rLA/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-lo-rLA/strings.xml
+++ b/cm/res/res/values-lo-rLA/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-lv/strings.xml b/cm/res/res/values-lv/strings.xml
index cf91f90..722d3b1 100644
--- a/cm/res/res/values-lv/strings.xml
+++ b/cm/res/res/values-lv/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-mk-rMK/strings.xml b/cm/res/res/values-mk-rMK/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-mk-rMK/strings.xml
+++ b/cm/res/res/values-mk-rMK/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-mn-rMN/strings.xml b/cm/res/res/values-mn-rMN/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-mn-rMN/strings.xml
+++ b/cm/res/res/values-mn-rMN/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-ms-rMY/strings.xml b/cm/res/res/values-ms-rMY/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-ms-rMY/strings.xml
+++ b/cm/res/res/values-ms-rMY/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-my-rMM/strings.xml b/cm/res/res/values-my-rMM/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-my-rMM/strings.xml
+++ b/cm/res/res/values-my-rMM/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-ne-rNP/strings.xml b/cm/res/res/values-ne-rNP/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-ne-rNP/strings.xml
+++ b/cm/res/res/values-ne-rNP/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-oc-rFR/strings.xml b/cm/res/res/values-oc-rFR/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-oc-rFR/strings.xml
+++ b/cm/res/res/values-oc-rFR/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-or-rIN/strings.xml b/cm/res/res/values-or-rIN/strings.xml
index 2f835a3..9a6ef08 100644
--- a/cm/res/res/values-or-rIN/strings.xml
+++ b/cm/res/res/values-or-rIN/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <string name="cyanogenmod_system_label">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ ସିଷ୍ଟମ୍‍</string>
   <string name="permlab_publishCustomTile">ଦ୍ରୁତ ସେଟିଂସମୂହ ପ୍ୟାନେଲ୍‍ ମଧ୍ୟରେ ଏକ କଷ୍ଟମ୍‍ ଟାଇଲ୍‍ ସୃଷ୍ଟି କରନ୍ତୁ</string>
   <string name="permdesc_publishCustomTile">ଏକ ଦ୍ରୁତ ସେଟିଂସମୂହ ଟାଇଲ୍‍ ପ୍ରକାଶନ କରିବା ପାଇଁ ଆପ୍ଲିକେସନ୍‍କୁ ଅନୁମତି ଦେଇଥାଏ</string>
diff --git a/cm/res/res/values-pa-rIN/strings.xml b/cm/res/res/values-pa-rIN/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-pa-rIN/strings.xml
+++ b/cm/res/res/values-pa-rIN/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-rm/strings.xml b/cm/res/res/values-rm/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-rm/strings.xml
+++ b/cm/res/res/values-rm/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-ro/strings.xml b/cm/res/res/values-ro/strings.xml
index 2704a0e..eca0047 100644
--- a/cm/res/res/values-ro/strings.xml
+++ b/cm/res/res/values-ro/strings.xml
@@ -50,8 +50,10 @@
   <string name="permdesc_read_alarms">Permite unei aplicații să citească alarmele programate.</string>
   <!-- Labels for the WRITE_SETTINGS permission -->
   <string name="permlab_writeSettings">modifică setările de sistem CM</string>
+  <string name="permdesc_writeSettings">Permite unei aplicații să modifice setările de sistem CM.</string>
   <!-- Labels for the WRITE_SECURE_SETTINGS permission -->
   <string name="permlab_writeSecureSettings">modifică setările de siguranță sistem CM</string>
+  <string name="permdesc_writeSecureSettings">Permite unei aplicații să modifice setările de sistem CM sigure. Nu este utilizabilă de către aplicațiile normale.</string>
   <!-- Labels for the MANAGE_PERSISTENT_STORAGE permission. -->
   <string name="permlab_managePersistentStorage">gestionează stocare persistentă</string>
   <string name="permdesc_managePersistentStorage">Permite unei aplicații să citească sau să scrie proprietăți ce se pot menține în urma unei reveniri la setările din fabrică.</string>
@@ -61,6 +63,7 @@
   <!-- Label to show for a service that is running because it is observing the user's custom tiles. -->
   <string name="custom_tile_listener_binding_label">Urmăritor de chenar personalizat</string>
   <!-- Labels for the PROTECTED_APP permission. -->
+  <string name="permlab_protectedApp">adăugați sau eliminați aplicații din aplicațiile protejate</string>
   <string name="permdesc_protectedApp">Permite unei aplicații să marcheze alte aplicații ca protejate și să le blocheze.</string>
   <!-- Profiles -->
   <!-- Names of default profiles. -->
@@ -86,12 +89,26 @@
   <string name="perf_profile_bias_perf">Rapid</string>
   <!-- LiveDisplay strings -->
   <string name="live_display_auto">Automat</string>
+  <string name="live_display_auto_summary">Reglează automat temperatura culorii ecranului în funcție de apus şi răsărit</string>
   <string name="live_display_off">Oprit</string>
+  <string name="live_display_off_summary">Dezactivați toate ajustările</string>
   <string name="live_display_day">Zi</string>
+  <string name="live_display_day_summary">Utilizați numai setările de zi</string>
   <string name="live_display_night">Noapte</string>
   <string name="live_display_night_summary">Utilizați numai setările de noapte</string>
   <string name="live_display_outdoor">În aer liber (soare strălucitor)</string>
   <string name="live_display_outdoor_summary">Utilizați numai setările în aer liber</string>
+  <string name="live_display_hint">LiveDisplay poate ajuta la reducerea oboselii ochilor şi vă ajută să dormiți la noapte. Clic aici pentru a-l încerca!</string>
+  <string name="accessibility_quick_settings_live_display_off">LiveDisplay este oprit.</string>
+  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: mod auto.</string>
+  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: mod zi.</string>
+  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: mod noapte.</string>
+  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: mod afară.</string>
+  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay este oprit.</string>
+  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay s-a schimbat la modul automat.</string>
+  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay s-a schimbat la modul zi.</string>
+  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay s-a schimbat la modul noapte.</string>
+  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay s-a schimbat la modul afară.</string>
   <!-- Third party keyguard permission label -->
   <string name="permlab_thirdPartyKeyguard">ecran de blocare terț</string>
   <!-- Third party keyguard permission description -->
@@ -106,34 +123,74 @@
   <string name="touchscreen_gesture_haptic_feedback_summary">Vibrează când s-a detectat un gest</string>
   <!-- Theme installation error notification -->
   <string name="theme_install_error_title">Instalarea temei a eșuat</string>
+  <string name="theme_install_error_message"><xliff:g id="theme">%1$s</xliff:g> nu s-a instalat</string>
   <!-- Theme reset notification -->
   <string name="theme_reset_notification_title">Resetare temă</string>
+  <string name="theme_reset_notification_message">Tema de sistem a fost restaurată datorită unor multiple crash-uri.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessThemeService">accesare serviciul pentru teme</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_accessThemeService">Permite unei aplicații să acceseze serviciul pentru teme. Aplicațiile normale nu ar trebui să aibă nevoie de aceasta.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readThemes">citiți informațiile temei dvs.</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readThemesDesc">Permite aplicației să citească temele dumneavoastră și
+       să determine pe care ați aplicat-o.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeThemes">modifică teme</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_writeThemesDesc">Permite aplicației să adauge teme noi și să le modifice pe cele aplicate.</string>
   <!-- Performance manager permission title -->
+  <string name="permlab_perfAccess">acces la managerul de performanță</string>
   <!-- Performance manager permission description -->
+  <string name="permdesc_perfAccessDesc">Permite unei aplicații să acceseze serviciul de performanță. Aplicațiile normale nu au nevoie de aceasta.</string>
   <!-- Access live lock screen manager service permission label -->
+  <string name="permlab_accessLiveLockScreenService">acces la serviciul managerului live lockscreen</string>
   <!-- Access live lock screen manager service permission description -->
+  <string name="permdesc_accessLiveLockScreenService">Permite unei aplicații să acceseze serviciul managerului live lockscreen.</string>
   <!-- Privileged access live lock screen manager service permission label -->
+  <string name="permlab_accessLiveLockScreenServicePrivate">acces la serviciul managerului live lockscreen</string>
   <!-- Privileged access live lock screen manager service permission description -->
+  <string name="permdesc_accessLiveLockScreenServicePrivate">Permite aplicațiilor de sistem să acceseze serviciul managerului live lockscreen.</string>
   <!-- Live lock screen manager service provider permission label -->
+  <string name="permlab_accessLiveLockScreenServiceProvider">furnizează serviciul managerului live lockscreen</string>
   <!-- Live lock screen manager service provider permission description -->
+  <string name="permdesc_accessLiveLockScreenServiceProvider">Permite unui serviciu să furnizeze serviciul managerului live lockscreen.</string>
   <!-- Weather Service strings -->
   <string name="permlab_weather_read">citește vremea</string>
+  <string name="permdesc_weather_read">Permite unei aplicații să citească conținutul furnizorului de vreme.</string>
   <string name="permlab_weather_write">actualizare furnizor meteo</string>
+  <string name="permdesc_weather_write">Permite unei aplicații să actualizeze conținutul furnizorului de vreme.</string>
+  <string name="permlab_weather_bind">fixează ca serviciu furnizor de vreme</string>
+  <string name="permdesc_weather_bind">Permite unei aplicații să fie identificată ca un serviciu furnizor de vreme.</string>
+  <string name="permlab_weather_access_mgr">accesează serviciul pentru vreme</string>
+  <string name="permdesc_weather_access_mgr">Permite unei aplicații să acceseze serviciul pentru vreme în sistem. Aplicațiile normale nu ar trebui să aibă nevoie de aceasta.</string>
   <!-- DataUsageProvider write permission title -->
+  <string name="permlab_dataUsageWrite">modifică baza de date a utilizării datelor</string>
   <!-- DataUsageProvider write permission description -->
+  <string name="permdesc_dataUsageWrite">Permite unei aplicații să actualizeze conținutul bazei de date despre utilizarea datelor.</string>
   <!-- DataUsageProvider read permission title -->
+  <string name="permlab_dataUsageRead">citește baza de date a utilizării datelor</string>
   <!-- DataUsageProvider read permission description -->
+  <string name="permdesc_dataUsageRead">Permite unei aplicații să citească conținutul bazei de date despre utilizarea datelor.</string>
   <!-- LiveDisplay manager permission -->
+  <string name="permlab_manageLiveDisplay">gestionează setările LiveDisplay</string>
+  <string name="permdesc_manageLiveDisplay">Permite unei aplicații să configureze setările de afișare avansate.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_observe_audio_sessions">observă schimbări sesiune audio</string>
+  <string name="permdesc_observe_audio_sessions">Permite unei aplicații să observe dacă fluxurile audio sunt create şi distruse.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">gestionează schimbările de sesiune audio</string>
+  <string name="permdesc_manage_audio_sessions">Permite unei aplicații să trimită actualizări de flux audio.</string>
   <!-- QuickSettings: Themes tile -->
+  <string name="qs_themes_label">Teme</string>
+  <string name="qs_themes_content_description">Personalizați tema</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Se pornesc aplicațiile\u2026</string>
+  <string name="android_upgrading_fstrim">Se optimizează stocarea\u2026</string>
+  <string name="android_upgrading_complete">Se pregătește pornirea\u2026</string>
+  <string name="android_upgrading_complete_details">Optimizare completă.</string>
+  <string name="android_preparing_apk">Se pregătește %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Se pregătesc aplicațiile\u2026</string>
+  <string name="android_upgrading_apk">%1$d din %2$d aplicații</string>
 </resources>
diff --git a/cm/res/res/values-ru/strings.xml b/cm/res/res/values-ru/strings.xml
index e90ca80..6989fd0 100644
--- a/cm/res/res/values-ru/strings.xml
+++ b/cm/res/res/values-ru/strings.xml
@@ -38,7 +38,7 @@
   <string name="permdesc_modifyProfiles">Приложение сможет изменять настройки системных профилей.</string>
   <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
   <string name="permlab_useHardwareFramework">Взаимодействие с оборудованием</string>
-  <string name="permdesc_useHardwareFramework">Приложение сможет получать доступ к подсистеме аппаратных абстракций LineageOS.</string>
+  <string name="permdesc_useHardwareFramework">Приложение сможет получать доступ к подсистеме аппаратных абстракций CyanogenMod.</string>
   <!-- Labels for the WRITE_ALARMS permission. -->
   <string name="permlab_write_alarms">Изменение будильников</string>
   <string name="permdesc_write_alarms">Приложение сможет добавлять, изменять или удалять любые будильники.</string>
diff --git a/cm/res/res/values-si-rLK/strings.xml b/cm/res/res/values-si-rLK/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-si-rLK/strings.xml
+++ b/cm/res/res/values-si-rLK/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-sq-rAL/strings.xml b/cm/res/res/values-sq-rAL/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-sq-rAL/strings.xml
+++ b/cm/res/res/values-sq-rAL/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-sv/strings.xml b/cm/res/res/values-sv/strings.xml
index cc5dd6a..d25cca5 100644
--- a/cm/res/res/values-sv/strings.xml
+++ b/cm/res/res/values-sv/strings.xml
@@ -38,7 +38,7 @@
   <string name="permdesc_modifyProfiles">Tillåter att en app ändrar systemprofiler.</string>
   <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
   <string name="permlab_useHardwareFramework">använda hårdvaruramverk</string>
-  <string name="permdesc_useHardwareFramework">Ger en app åtkomst till LineageOSs hårdvaruramverk.</string>
+  <string name="permdesc_useHardwareFramework">Ger en app åtkomst till CyanogenMods hårdvaruramverk.</string>
   <!-- Labels for the WRITE_ALARMS permission. -->
   <string name="permlab_write_alarms">ändra alarm direkt</string>
   <string name="permdesc_write_alarms">Tillåter att en app lägger till, ändrar eller tar bort alla dina alarm.</string>
diff --git a/cm/res/res/values-sw/strings.xml b/cm/res/res/values-sw/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-sw/strings.xml
+++ b/cm/res/res/values-sw/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-te-rIN/strings.xml b/cm/res/res/values-te-rIN/strings.xml
index 59604cc..fbdc497 100644
--- a/cm/res/res/values-te-rIN/strings.xml
+++ b/cm/res/res/values-te-rIN/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <string name="cyanogenmod_system_label">సయనోజెన్ మోడ్ సిస్టమ్</string>
   <string name="permlab_publishCustomTile">త్వరిత సెట్టింగుల ప్యానలులో అనుకూలిత టైలును సృష్టించుము</string>
   <string name="permdesc_publishCustomTile">త్వరిత సెట్టింగుల టైలును ప్రచురించేందుకు ప్రోగ్రాంకి అనుమతినిస్తుంది.</string>
diff --git a/cm/res/res/values-uk/strings.xml b/cm/res/res/values-uk/strings.xml
index 4cf7467..fc384a7 100644
--- a/cm/res/res/values-uk/strings.xml
+++ b/cm/res/res/values-uk/strings.xml
@@ -35,7 +35,7 @@
   <string name="permlab_modifyProfiles">зміна системних профілів</string>
   <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
   <string name="permlab_useHardwareFramework">Взаємодія із обладнанням</string>
-  <string name="permdesc_useHardwareFramework">Додаток зможе отримувати доступ до підсистеми апаратних абстракцій LineageOS.</string>
+  <string name="permdesc_useHardwareFramework">Додаток зможе отримувати доступ до підсистеми апаратних абстракцій CyanogenMod.</string>
   <!-- Labels for the WRITE_ALARMS permission. -->
   <string name="permlab_write_alarms">безпосередньо змінювати установки будильника</string>
   <string name="permdesc_write_alarms">Дозволяє програмі додавати, змінювати або видаляти налаштування сигналів будильника.</string>
diff --git a/cm/res/res/values-ur-rPK/strings.xml b/cm/res/res/values-ur-rPK/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-ur-rPK/strings.xml
+++ b/cm/res/res/values-ur-rPK/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-uz-rUZ/strings.xml b/cm/res/res/values-uz-rUZ/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-uz-rUZ/strings.xml
+++ b/cm/res/res/values-uz-rUZ/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->
diff --git a/cm/res/res/values-zh-rCN/strings.xml b/cm/res/res/values-zh-rCN/strings.xml
index 808311d..c4629fb 100644
--- a/cm/res/res/values-zh-rCN/strings.xml
+++ b/cm/res/res/values-zh-rCN/strings.xml
@@ -98,7 +98,7 @@
   <string name="live_display_night_summary">仅使用夜晚设置</string>
   <string name="live_display_outdoor">户外（阳光）</string>
   <string name="live_display_outdoor_summary">仅使用户外设置</string>
-  <string name="live_display_hint">LiveDisplay 可以帮助减少眼睛疲劳，帮助您的夜间睡眠。点击此处来试一试！</string>
+  <string name="live_display_hint">LiveDisplay 可以帮助降低视疲劳，并有助于您的夜间睡眠。点击此处尝试它！</string>
   <string name="accessibility_quick_settings_live_display_off">LiveDisplay 关闭。</string>
   <string name="accessibility_quick_settings_live_display_auto">LiveDisplay：自动模式。</string>
   <string name="accessibility_quick_settings_live_display_day">LiveDisplay：白天模式。</string>
@@ -134,15 +134,15 @@
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readThemes">读取您的主题信息</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_readThemesDesc">允许应用读取您的主题并确定已应用的主题。</string>
+  <string name="permdesc_readThemesDesc">允许应用读取您的主题和确认您已应用的主题。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeThemes">修改您的主题</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_writeThemesDesc">允许应用插入新的主题和修改已应用的主题。</string>
+  <string name="permdesc_writeThemesDesc">允许应用插入新的主题和修改您已应用的主题。</string>
   <!-- Performance manager permission title -->
   <string name="permlab_perfAccess">访问性能管理器</string>
   <!-- Performance manager permission description -->
-  <string name="permdesc_perfAccessDesc">允许应用访问性能服务。正常应用不应需要此权限。</string>
+  <string name="permdesc_perfAccessDesc">允许应用访问性能服务。普通应用不应需要此权限。</string>
   <!-- Access live lock screen manager service permission label -->
   <string name="permlab_accessLiveLockScreenService">访问活动锁屏管理器服务</string>
   <!-- Access live lock screen manager service permission description -->
diff --git a/cm/res/res/values-zh-rHK/strings.xml b/cm/res/res/values-zh-rHK/strings.xml
index 18fc3a6..fb35bc0 100644
--- a/cm/res/res/values-zh-rHK/strings.xml
+++ b/cm/res/res/values-zh-rHK/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <string name="permdesc_bindCustomTileListenerService">允許應用程式綁定到自訂按鈕偵聽器服務的最高級介面。</string>
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
diff --git a/cm/res/res/values-zh-rTW/strings.xml b/cm/res/res/values-zh-rTW/strings.xml
index bfdb1dd..77bd4d7 100644
--- a/cm/res/res/values-zh-rTW/strings.xml
+++ b/cm/res/res/values-zh-rTW/strings.xml
@@ -20,13 +20,13 @@
   <!-- Label for the LineageOS system components when they are shown to the user. -->
   <string name="cyanogenmod_system_label">LineageOS 系統</string>
   <string name="permlab_publishCustomTile">於快速設定面板中建立自訂標題</string>
-  <string name="permdesc_publishCustomTile">允許應用程式發佈快速設定磚</string>
-  <string name="permlab_modifyNetworkSettings">更改系統網路設定</string>
+  <string name="permdesc_publishCustomTile">允許應用程式發佈快速設定圖塊</string>
+  <string name="permlab_modifyNetworkSettings">變更系統網路設定</string>
   <string name="permdesc_modifyNetworkSettings">允許應用程式修改飛航模式和行動數據網路設定。</string>
-  <string name="permlab_modifySoundSettings">更改系統聲音設定</string>
-  <string name="permdesc_modifySoundSettings">允許應用程式更改中斷模式音效設定。</string>
-  <string name="permlab_bindCustomTileListenerService">綁定到一個自訂瓷磚偵聽器服務</string>
-  <string name="permdesc_bindCustomTileListenerService">允許應用程式綁定到自訂瓷磚偵聽器服務的最頂端介面。</string>
+  <string name="permlab_modifySoundSettings">變更系統聲音設定</string>
+  <string name="permdesc_modifySoundSettings">允許應用程式變更中斷模式音效設定。</string>
+  <string name="permlab_bindCustomTileListenerService">綁定到一個自訂圖塊偵聽器服務</string>
+  <string name="permdesc_bindCustomTileListenerService">允許應用程式綁定到自訂圖塊偵聽器服務的最頂端介面。</string>
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <string name="permlab_readMSPhoneState">在支援多張 SIM 卡的裝置上查看電話狀態和數據連線</string>
   <string name="permdesc_readMSPhoneState">允許應用程式查看支援多張 SIM 卡的裝置的電話狀態和數據連線</string>
@@ -43,17 +43,17 @@
   <string name="permlab_write_alarms">直接修改鬧鐘</string>
   <string name="permdesc_write_alarms">允許應用程式增加、修改或刪除您的鬧鐘。</string>
   <!-- Labels for the MANAGE_ALARMS permission. -->
-  <string name="permlab_manage_alarms">開啟/關閉已設定的鬧鐘</string>
+  <string name="permlab_manage_alarms">切換至已設定的鬧鐘</string>
   <string name="permdesc_manage_alarms">允許應用程式開啟或關閉已設定的鬧鐘。</string>
   <!-- Labels for the READ_ALARMS permission. -->
   <string name="permlab_read_alarms">讀取已設定的鬧鐘</string>
   <string name="permdesc_read_alarms">允許應用程式讀取已設定的鬧鐘。</string>
   <!-- Labels for the WRITE_SETTINGS permission -->
-  <string name="permlab_writeSettings">修改CM系統設定</string>
-  <string name="permdesc_writeSettings">允許應用程式更改CM系統設定</string>
+  <string name="permlab_writeSettings">修改 CM 系統設定</string>
+  <string name="permdesc_writeSettings">允許應用程式更改 CM 系統設定</string>
   <!-- Labels for the WRITE_SECURE_SETTINGS permission -->
   <string name="permlab_writeSecureSettings">修改 CM 系統安全設定</string>
-  <string name="permdesc_writeSecureSettings">允許應用程式修改CM安全系統設定，非供一般應用程式使用。</string>
+  <string name="permdesc_writeSecureSettings">允許應用程式修改 CM 安全系統設定，非供一般應用程式使用。</string>
   <!-- Labels for the MANAGE_PERSISTENT_STORAGE permission. -->
   <string name="permlab_managePersistentStorage">管理永久儲存空間</string>
   <string name="permdesc_managePersistentStorage">允許應用程式讀/寫一些重設後仍可保存的屬性。</string>
@@ -61,7 +61,7 @@
   <string name="permlab_accessAppSuggestions">存取應用程式建議</string>
   <string name="permdesc_accessAppSuggestions">允許應用程式存取應用程式建議。</string>
   <!-- Label to show for a service that is running because it is observing the user's custom tiles. -->
-  <string name="custom_tile_listener_binding_label">自訂瓷磚偵聽器</string>
+  <string name="custom_tile_listener_binding_label">自訂圖塊偵聽器</string>
   <!-- Labels for the PROTECTED_APP permission. -->
   <string name="permlab_protectedApp">新增或移除受保護的應用程式</string>
   <string name="permdesc_protectedApp">允許應用程式標示其他應用程式為受保護並將其鎖定。</string>
@@ -71,7 +71,7 @@
   <string name="profileNameWork">工作</string>
   <string name="profileNameHome">住家</string>
   <string name="profileNameSilent">安靜</string>
-  <string name="profileNameNight">夜晚</string>
+  <string name="profileNameNight">夜間</string>
   <string name="profileNameAutomobile">汽車</string>
   <!-- Names of application groups. -->
   <string name="profileGroupPhone">電話</string>
@@ -94,7 +94,7 @@
   <string name="live_display_off_summary">停用所有調整</string>
   <string name="live_display_day">日間</string>
   <string name="live_display_day_summary">僅限使用日間設定</string>
-  <string name="live_display_night">夜晚</string>
+  <string name="live_display_night">夜間</string>
   <string name="live_display_night_summary">僅限使用夜間設定</string>
   <string name="live_display_outdoor">戶外 (陽光)</string>
   <string name="live_display_outdoor_summary">僅限使用戶外設定</string>
@@ -105,14 +105,14 @@
   <string name="accessibility_quick_settings_live_display_night">LiveDisplay：夜間模式</string>
   <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay：戶外模式</string>
   <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay 已關閉</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay 已更改為自動模式</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay 已更改為日間模式</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay 已更改為夜間模式</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay 已更改為戶外模式</string>
+  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay 已變更為自動模式</string>
+  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay 已變更為日間模式</string>
+  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay 已變更為夜間模式</string>
+  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay 已變更為戶外模式</string>
   <!-- Third party keyguard permission label -->
-  <string name="permlab_thirdPartyKeyguard">第三方鎖定螢幕</string>
+  <string name="permlab_thirdPartyKeyguard">第三方鎖定畫面</string>
   <!-- Third party keyguard permission description -->
-  <string name="permdesc_thirdPartyKeyguard">允許應用程式用作不安全的鎖定螢幕。</string>
+  <string name="permdesc_thirdPartyKeyguard">允許應用程式用作不安全的鎖定畫面。</string>
   <!-- Device specific settings -->
   <string name="device_settings_app_name">進階設定</string>
   <!-- Touchscreen gestures -->
@@ -135,7 +135,7 @@
   <string name="permlab_readThemes">閱讀您的主題資訊</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readThemesDesc">允許應用程式讀取您的主題，
-       並確定您已應用哪個的主題。       </string>
+       並確定您已套用哪個的主題。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeThemes">修改您的主題</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -145,17 +145,17 @@
   <!-- Performance manager permission description -->
   <string name="permdesc_perfAccessDesc">允許應用程式存取效能服務 。一般應用程式不需使用。</string>
   <!-- Access live lock screen manager service permission label -->
-  <string name="permlab_accessLiveLockScreenService">存取活動鎖定螢幕管理員服務</string>
+  <string name="permlab_accessLiveLockScreenService">存取活動鎖定畫面管理員服務</string>
   <!-- Access live lock screen manager service permission description -->
-  <string name="permdesc_accessLiveLockScreenService">允許應用程式存取活動鎖定螢幕管理員服務。</string>
+  <string name="permdesc_accessLiveLockScreenService">允許應用程式存取活動鎖定畫面管理員服務。</string>
   <!-- Privileged access live lock screen manager service permission label -->
-  <string name="permlab_accessLiveLockScreenServicePrivate">存取活動鎖定鎖螢幕管理員服務</string>
+  <string name="permlab_accessLiveLockScreenServicePrivate">存取活動鎖定畫面管理員服務</string>
   <!-- Privileged access live lock screen manager service permission description -->
-  <string name="permdesc_accessLiveLockScreenServicePrivate">允許系統應用程式存取活動鎖定鎖螢幕管理員服務。</string>
+  <string name="permdesc_accessLiveLockScreenServicePrivate">允許系統應用程式存取活動鎖定畫面管理員服務。</string>
   <!-- Live lock screen manager service provider permission label -->
-  <string name="permlab_accessLiveLockScreenServiceProvider">提供活動鎖定鎖螢幕管理員服務</string>
+  <string name="permlab_accessLiveLockScreenServiceProvider">提供活動鎖定畫面管理員服務</string>
   <!-- Live lock screen manager service provider permission description -->
-  <string name="permdesc_accessLiveLockScreenServiceProvider">允許服務提供活動鎖定鎖螢幕管理員服務。</string>
+  <string name="permdesc_accessLiveLockScreenServiceProvider">允許服務提供活動鎖定畫面管理員服務。</string>
   <!-- Weather Service strings -->
   <string name="permlab_weather_read">讀取天氣資料</string>
   <string name="permdesc_weather_read">允許應用程式從天氣資訊提供者讀取資料內容</string>
@@ -177,8 +177,8 @@
   <string name="permlab_manageLiveDisplay">管理 LiveDisplay 設定</string>
   <string name="permdesc_manageLiveDisplay">允許應用程式設定進階顯示配置</string>
   <!-- CMAudioService - observe session changes permission -->
-  <string name="permlab_observe_audio_sessions">察看音訊會話變動</string>
-  <string name="permdesc_observe_audio_sessions">允許應用程式察看音訊串流的建立和銷毀。</string>
+  <string name="permlab_observe_audio_sessions">觀察音訊會話變動</string>
+  <string name="permdesc_observe_audio_sessions">允許應用程式觀察音訊串流的建立和銷毀。</string>
   <!-- CMAudioService - observe session changes permission -->
   <string name="permlab_manage_audio_sessions">管理音訊會話變動</string>
   <string name="permdesc_manage_audio_sessions">允許應用程式傳送音訊串流更新。</string>
diff --git a/cm/res/res/values-zu/strings.xml b/cm/res/res/values-zu/strings.xml
index babdb88..1d58e98 100644
--- a/cm/res/res/values-zu/strings.xml
+++ b/cm/res/res/values-zu/strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2015 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Label for the LineageOS system components when they are shown to the user. -->
   <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
   <!-- Labels for the MODIFY_PROFILES permission. -->