diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b6f136b..f949a85 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS instellings</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Laai tans\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Soek</string>
   <string name="disabled">Gedeaktiveer</string>
   <string name="enabled">Geaktiveer</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privaatheid</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normaal</string>
   <string name="pulse_speed_slow">Stadig</string>
   <string name="pulse_speed_very_slow">Baie stadig</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Battery liggie</string>
   <string name="battery_low_pulse_title">Flikker wanneer battery laag is</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Tuis dubbel tik aksie</string>
   <!-- Power menu -->
   <string name="power_menu_title">Krag kieslys</string>
-  <string name="power_menu_reboot_title">Herlaai kieslys</string>
   <string name="power_menu_screenshot_title">Skermkiekie</string>
   <string name="power_menu_airplane_title">Vliegtuigmodus</string>
   <string name="power_menu_users_title">Gebruiker wisselaar</string>
-  <string name="power_menu_settings_title">Instellings kortpad</string>
-  <string name="power_menu_lockdown_title">Sluit toestel</string>
   <string name="power_menu_bug_report_title">Fout verslag</string>
-  <string name="power_menu_sound_title">Klank paneel</string>
   <string name="power_menu_bug_report_disabled">Fout verslagdoening is in ontwikkelaar opsies gedeaktiveer</string>
   <string name="volume_keys_control_ring_stream_title">Beheer luitoon volume</string>
   <string name="volume_keys_control_ring_stream_summary_on">Volume-knoppies beheer luitoon volume</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statusbalkikone</string>
   <string name="status_bar_icons_summary">Beheer watter status balk ikone word getoon</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Beskermde programme</string>
   <string name="protected_apps_manager_summary">Bestuur watter toepassings is verberg agter \'n veilige slot</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Speel/laat wag musiekterugspeel</string>
   <string name="touchscreen_gesture_action_previous_track">Navigeer na die vorige musiekbaan</string>
   <string name="touchscreen_gesture_action_next_track">Slaan oor na die volgende musiekbaan</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index cc745c3..f6a9baf 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Axustes de LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Cargando\u2026</string>
   <string name="dlg_ok">Aceutar</string>
@@ -37,6 +36,7 @@
   <string name="no">Non</string>
   <string name="search">Guetar</string>
   <string name="disabled">Deshabilitóse</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacidá</string>
   <!-- Privacy Guard -->
@@ -61,6 +61,7 @@
   <!-- Values for the notification light pulse spinners -->
   <string name="pulse_length_normal">Normal</string>
   <string name="pulse_speed_normal">Normal</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Lluz de batería</string>
   <string name="battery_low_pulse_title">Parpaguiar cola batería baxa</string>
@@ -158,12 +159,10 @@
   <string name="navigation_bar_left_summary">Alluga la barra de navegación nel llau esquierdu de la pantalla nel mou apaisáu</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menú d\'apagáu</string>
-  <string name="power_menu_reboot_title">Menú de reaniciu</string>
   <string name="power_menu_screenshot_title">Capturar pantalla</string>
   <string name="power_menu_airplane_title">Mou avión</string>
   <string name="power_menu_users_title">Seleutor d\'usuarios</string>
   <string name="power_menu_bug_report_title">Informe de fallos</string>
-  <string name="power_menu_sound_title">Panel de soníu</string>
   <string name="power_menu_bug_report_disabled">L\'informe de fallos ta deshabilitáu nos axustes de desendolcu</string>
   <string name="volume_keys_control_ring_stream_title">Controlar el volume del timbre</string>
   <string name="volume_keys_control_ring_stream_summary_on">Les tecles de volume controlen el volume del timbre</string>
@@ -314,6 +313,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Iconos de barra d\'estáu</string>
   <string name="status_bar_icons_summary">Contola qu\'iconos de la barra d\'estáu s\'amuesen</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicaciones protexíes</string>
   <string name="protected_apps_manager_summary">Xestiona qu\'aplicaciones s\'anubren darrera d\'un bloquéu de seguranza</string>
@@ -432,4 +432,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reproducir/posar música</string>
   <string name="touchscreen_gesture_action_previous_track">Navegar a la pista musical previa</string>
   <string name="touchscreen_gesture_action_next_track">Saltar a la pista musical de darréu</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-az-rAZ/plurals.xml b/res/values-az/plurals.xml
similarity index 100%
rename from res/values-az-rAZ/plurals.xml
rename to res/values-az/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 91%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-be-rBY/plurals.xml b/res/values-b+sr+Latn/plurals.xml
similarity index 100%
copy from res/values-be-rBY/plurals.xml
copy to res/values-b+sr+Latn/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-b+sr+Latn/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-b+sr+Latn/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-be-rBY/plurals.xml b/res/values-be/plurals.xml
similarity index 100%
rename from res/values-be-rBY/plurals.xml
rename to res/values-be/plurals.xml
diff --git a/res/values-be-rBY/strings.xml b/res/values-be/strings.xml
similarity index 98%
rename from res/values-be-rBY/strings.xml
rename to res/values-be/strings.xml
index 528e017..4189509 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Налады LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Ладаваньне\u2026</string>
   <string name="dlg_ok">Добра</string>
@@ -38,6 +37,7 @@
   <string name="search">Пошук</string>
   <string name="disabled">Не задзейнічана</string>
   <string name="enabled">Задзейнічана</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Прыватнасць</string>
   <!-- Privacy Guard -->
@@ -74,6 +74,7 @@
   <string name="pulse_speed_normal">Звычайны</string>
   <string name="pulse_speed_slow">Павольна</string>
   <string name="pulse_speed_very_slow">Вельмі павольна</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Паказчык жывелькі</string>
   <string name="battery_low_pulse_title">Мігцець падчас нізкага ўзроўню зараду</string>
@@ -171,14 +172,10 @@
   <string name="navigation_bar_home_double_tap_title">Падвойнае крананьне кнопкі \"Хатоўка\"</string>
   <!-- Power menu -->
   <string name="power_menu_title">Дзеяньні пры ўтрыманьні кнопкі выключэньня</string>
-  <string name="power_menu_reboot_title">Перазапусканьне</string>
   <string name="power_menu_screenshot_title">Здымак экрану</string>
   <string name="power_menu_airplane_title">Рэжым лёту</string>
   <string name="power_menu_users_title">Зьмяніць карыстальніка</string>
-  <string name="power_menu_settings_title">Цэтлік наладаў</string>
-  <string name="power_menu_lockdown_title">Блакаваньне прылады</string>
   <string name="power_menu_bug_report_title">Справаздача пра памылкі</string>
-  <string name="power_menu_sound_title">Гукавая панэль</string>
   <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Выдаліць</string>
@@ -290,6 +287,7 @@
   <string name="status_bar_toggle_brightness">Кіраваньне яскравасьцьцю</string>
   <string name="status_bar_toggle_brightness_summary">Рэгуляваць яскравасьць экрану рухам пальца, па радку стану</string>
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -317,4 +315,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e87fa3b..505c082 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Търсене</string>
   <string name="disabled">Деактивирано</string>
   <string name="enabled">Активирано</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Поверителност</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Нормална</string>
   <string name="pulse_speed_slow">Бавно</string>
   <string name="pulse_speed_very_slow">Много бавно</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Нива на яркост</string>
+  <string name="light_brightness_normal">Нормално</string>
+  <string name="light_brightness_zen">Не безпокойте</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Индикации на батерия</string>
   <string name="battery_low_pulse_title">Индикация при изтощена батерия</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Отговаряне на входящите повиквания чрез натискане на бутоните за звук</string>
   <string name="home_answer_call_title">Отговори на обаждане</string>
   <string name="home_answer_call_summary">Отговаряне на входящите повиквания чрез натискане на бутона за Начало</string>
+  <string name="extras_title">Екстри</string>
+  <string name="additional_buttons_title">Допълнителни бутони</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Подсветка</string>
   <string name="button_backlight_enabled">Осветяване на бутоните</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Показване на ляв и десен курсорен бутони при въвеждане. Замества IME превключвател.</string>
   <string name="navigation_bar_home_long_press_title">Действие при дълго натисканане на начало</string>
   <string name="navigation_bar_home_double_tap_title">Действие при двукратно натискане на начало</string>
+  <string name="navigation_bar_app_switch_long_press_title">Последни дълги натискания действия</string>
   <!-- Power menu -->
   <string name="power_menu_title">Меню мощност</string>
-  <string name="power_menu_reboot_title">Меню рестартиране</string>
   <string name="power_menu_screenshot_title">Снимка на екрана</string>
+  <string name="power_menu_screenshot_summary">Продължително натискане за частична екранна снимка</string>
   <string name="power_menu_airplane_title">Самолетен режим</string>
   <string name="power_menu_users_title">Потребители</string>
-  <string name="power_menu_settings_title">Настройки на преки пътища</string>
-  <string name="power_menu_lockdown_title">Заключване на устройството</string>
   <string name="power_menu_bug_report_title">Доклад за грешка</string>
-  <string name="power_menu_sound_title">Звуков панел</string>
   <string name="power_menu_bug_report_disabled">Доклади за грешки са забранени от настройките за разработчици</string>
   <string name="volume_keys_control_ring_stream_title">Силата на звука при звънене</string>
   <string name="volume_keys_control_ring_stream_summary_on">С бутоните за сила на звука регулирате силата на звънене</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Икони на лентата</string>
   <string name="status_bar_icons_summary">Изберете, кои икони да се показват в лентата на състоянието</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Монитор на Мрежовия трафик</string>
+  <string name="network_traffic_settings_summary">Покажи нивата на текущия мрежов трафик в лентата на състоянието</string>
+  <string name="network_traffic_mode_title">Режим на екрана</string>
+  <string name="network_traffic_mode_disable">Деактивирано</string>
+  <string name="network_traffic_mode_up">Качи само</string>
+  <string name="network_traffic_mode_down">Само изтегляне</string>
+  <string name="network_traffic_mode_all">Сваляне и качване</string>
+  <string name="network_traffic_autohide">Автоматично скриване</string>
+  <string name="network_traffic_autohide_summary">Скриване на трафик индикатора, когато няма дейност</string>
+  <string name="network_traffic_units_title">Трафик мерни единици</string>
+  <string name="network_traffic_units_kilobits">Килобита в секунда (Кб/с)</string>
+  <string name="network_traffic_units_megabits">Мегабита в секунда (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Килобайта в секунда (Кб/с)</string>
+  <string name="network_traffic_units_megabytes">Мегабайта в секунда (MB/s)</string>
+  <string name="network_traffic_show_units">Покажи единици</string>
+  <string name="network_traffic_show_units_summary">Дали да се показват мерните единици за измерване на трафика в лентата на състоянието</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Защитени приложения</string>
   <string name="protected_apps_manager_summary">Изберете кои приложения да се зареждат след въвеждане на парола</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Изпишете буквата \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Изпишете буквата \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Плъзнете нагоре с писалката</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Плъзнете надолу с писалката</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Плъзнете наляво с писалката</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Тласнете надясно с писалката</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Дълго натискане с писалката</string>
   <string name="touchscreen_gesture_action_dialog_title">Жестове</string>
   <string name="touchscreen_gesture_action_do_nothing">Не прави нищо</string>
   <string name="touchscreen_gesture_action_flashlight">Включване / Изключване на фенерчето</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Възпроизвеждане и пауза на музика</string>
   <string name="touchscreen_gesture_action_previous_track">Преминаване към предишната песен</string>
   <string name="touchscreen_gesture_action_next_track">Преминаване към следващата песен</string>
+  <string name="touchscreen_gesture_action_volume_down">По-ниска сила на звука на медията</string>
+  <string name="touchscreen_gesture_action_volume_up">По-висока сила на звука на медията</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-bn-rBD/plurals.xml b/res/values-bn/plurals.xml
similarity index 100%
rename from res/values-bn-rBD/plurals.xml
rename to res/values-bn/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-bn/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-bn/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-bn/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-bs-rBA/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-bs-rBA/plurals.xml b/res/values-bs/plurals.xml
similarity index 100%
rename from res/values-bs-rBA/plurals.xml
rename to res/values-bs/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-bs/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-bs/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6c089a8..520b83a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Cerca</string>
   <string name="disabled">Deshabilitat</string>
   <string name="enabled">Habilitat</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privadesa</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lent</string>
   <string name="pulse_speed_very_slow">Molt lent</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Nivells de lluminositat</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">No molestis</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Llum de la bateria</string>
   <string name="battery_low_pulse_title">Parpalleja si la bateria està baixa</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Contesta les trucades entrants prement els botons de volum</string>
   <string name="home_answer_call_title">Contesta la trucada</string>
   <string name="home_answer_call_summary">Contesta les trucades entrants prement el botó d\'inici</string>
+  <string name="extras_title">Extres</string>
+  <string name="additional_buttons_title">Botons addicionals</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Retroil·luminació</string>
   <string name="button_backlight_enabled">Il·lumina els botons</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Mostra els botons dels cursors esquerra i dreta mentre escrius. Això anul·la el commutador IME.</string>
   <string name="navigation_bar_home_long_press_title">Acció de pulsació llarga d\'Inici</string>
   <string name="navigation_bar_home_double_tap_title">Acció de doble pulsació d\'Inici</string>
+  <string name="navigation_bar_app_switch_long_press_title">Acció pulsació llarga de Recents</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menú d\'apagat</string>
-  <string name="power_menu_reboot_title">Menú de reinici</string>
   <string name="power_menu_screenshot_title">Captura de pantalla</string>
+  <string name="power_menu_screenshot_summary">Pulsació llarga per a fer una captura de pantalla parcial</string>
   <string name="power_menu_airplane_title">Mode avió</string>
   <string name="power_menu_users_title">Intercanviador d\'usuaris</string>
-  <string name="power_menu_settings_title">Drecera a la configuració</string>
-  <string name="power_menu_lockdown_title">Bloqueig del dispositiu</string>
   <string name="power_menu_bug_report_title">Informe d\'error</string>
-  <string name="power_menu_sound_title">Panell de so</string>
   <string name="power_menu_bug_report_disabled">Els informes d\'error estan deshabilitats a les opcions de desenvolupament</string>
   <string name="volume_keys_control_ring_stream_title">Controla el volum de la trucada</string>
   <string name="volume_keys_control_ring_stream_summary_on">Les tecles de volum controlen el volum del to de trucada</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Icones de la barra d\'estat</string>
   <string name="status_bar_icons_summary">Controla quines icones de la barra d\'estat es mostren</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitor de trànsit de xarxa</string>
+  <string name="network_traffic_settings_summary">Mostra els nivells actuals de trànsit de xarxa a la barra d\'estat</string>
+  <string name="network_traffic_mode_title">Mode de pantalla</string>
+  <string name="network_traffic_mode_disable">Deshabilitat</string>
+  <string name="network_traffic_mode_up">Només pujada</string>
+  <string name="network_traffic_mode_down">Només baixada</string>
+  <string name="network_traffic_mode_all">Pujada i baixada</string>
+  <string name="network_traffic_autohide">Amaga automàticament</string>
+  <string name="network_traffic_autohide_summary">Amaga el monitor de trànsit quan no hi hagi activitat</string>
+  <string name="network_traffic_units_title">Unitats de mesura de trànsit</string>
+  <string name="network_traffic_units_kilobits">Kilobits per segon (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits per segon (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes per segon (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes per segon (MB/s)</string>
+  <string name="network_traffic_show_units">Mostra les unitats</string>
+  <string name="network_traffic_show_units_summary">Si vols mostrar les unitats de mesura del trànsit a la barra d\'estat</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicacions protegides</string>
   <string name="protected_apps_manager_summary">Gestiona quines aplicacions s\'amaguen darrere el bloqueig segur</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Dibuixa la lletra \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Dibuixa la lletra \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Feu lliscar cap a dalt amb el llapis</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Feu lliscar cap a baix amb el llapis</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Feu lliscar cap a l\'esquerra amb el llapis</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Feu lliscar cap a la dreta amb el llapis</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Premeu i mantingueu premut amb el llapis</string>
   <string name="touchscreen_gesture_action_dialog_title">Acció gestual</string>
   <string name="touchscreen_gesture_action_do_nothing">No facis res</string>
   <string name="touchscreen_gesture_action_flashlight">Encén/apaga la llanterna</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reprodueix/pausa la reproducció de música</string>
   <string name="touchscreen_gesture_action_previous_track">Navega a la pista de música anterior</string>
   <string name="touchscreen_gesture_action_next_track">Vés a la següent pista de música</string>
+  <string name="touchscreen_gesture_action_volume_down">Abaixa el volum multimèdia</string>
+  <string name="touchscreen_gesture_action_volume_up">Apuja el volum multimèdia</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fdde1a7..4be9607 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Vyhledat</string>
   <string name="disabled">Zakázáno</string>
   <string name="enabled">Povoleno</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Soukromí</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normálně</string>
   <string name="pulse_speed_slow">Pomalu</string>
   <string name="pulse_speed_very_slow">Velmi pomalu</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Úrovně jasu</string>
+  <string name="light_brightness_normal">Normální</string>
+  <string name="light_brightness_zen">Nerušit</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Ukazatel baterie</string>
   <string name="battery_low_pulse_title">Blikat, když je baterie vybitá</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Přijmout příchozí hovor stisknutím tlačítka hlasitosti</string>
   <string name="home_answer_call_title">Přijmout hovor</string>
   <string name="home_answer_call_summary">Přijmout příchozí hovor stisknutím tlačítka „Domů“</string>
+  <string name="extras_title">Doplňky</string>
+  <string name="additional_buttons_title">Další tlačítka</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Podsvícení</string>
   <string name="button_backlight_enabled">Podsvícení tlačítek</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Zobrazit levý a pravý kurzor při psaní. Potlačí IME přepínač.</string>
   <string name="navigation_bar_home_long_press_title">Akce dlouhého stisku tlačítka „Domů“</string>
   <string name="navigation_bar_home_double_tap_title">Akce dvojitého stisku tlačítka „Domů“</string>
+  <string name="navigation_bar_app_switch_long_press_title">Akce dlouhého stisku tlačítka „Nedávné“</string>
   <!-- Power menu -->
   <string name="power_menu_title">Nabídka tlačítka Vypnout</string>
-  <string name="power_menu_reboot_title">Nabídka restartu</string>
   <string name="power_menu_screenshot_title">Snímek obrazovky</string>
+  <string name="power_menu_screenshot_summary">Dlouhým dotykem pro získání částečného snímku obrazovky</string>
   <string name="power_menu_airplane_title">Režim „V letadle“</string>
   <string name="power_menu_users_title">Přepnutí uživatele</string>
-  <string name="power_menu_settings_title">Zástupce nastavení</string>
-  <string name="power_menu_lockdown_title">Uzamčení zařízení</string>
   <string name="power_menu_bug_report_title">Hlášení chyb</string>
-  <string name="power_menu_sound_title">Panel hlasitosti</string>
   <string name="power_menu_bug_report_disabled">Hlášení chyb je zakázáno ve vývojářských nastaveních</string>
   <string name="volume_keys_control_ring_stream_title">Ovládání hlasitosti vyzvánění</string>
   <string name="volume_keys_control_ring_stream_summary_on">Tlačítka hlasitosti ovládají hlasitost vyzvánění</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikony stavové lišty</string>
   <string name="status_bar_icons_summary">Upravit zobrazení ikon na stavové liště</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Sledování síťového provozu</string>
+  <string name="network_traffic_settings_summary">Zobrazit rychlost přenosu dat ve stavové liště</string>
+  <string name="network_traffic_mode_title">Režim zobrazení</string>
+  <string name="network_traffic_mode_disable">Zakázáno</string>
+  <string name="network_traffic_mode_up">Pouze odchozí data</string>
+  <string name="network_traffic_mode_down">Pouze příchozí data</string>
+  <string name="network_traffic_mode_all">Příchozí a odchozí data</string>
+  <string name="network_traffic_autohide">Automaticky skrývat</string>
+  <string name="network_traffic_autohide_summary">Skrýt indikátor síťového provozu, pokud není žádná aktivita</string>
+  <string name="network_traffic_units_title">Jednotky měření síťového provozu</string>
+  <string name="network_traffic_units_kilobits">Kilobity za sekundu (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabity za sekundu (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobajty za sekundu (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabajty za sekundu (MB/s)</string>
+  <string name="network_traffic_show_units">Zobrazit jednotky</string>
+  <string name="network_traffic_show_units_summary">Zobrazení jednotek měření síť. provozu ve stavové liště</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Chráněné aplikace</string>
   <string name="protected_apps_manager_summary">Spravovat, které aplikace jsou skryté za bezpečnostním zámkem</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Nakreslit písmeno „W“</string>
   <string name="touchscreen_gesture_letter_z_title">Nakreslit písmeno „Z“</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Potáhnutí nahoru dotykovým perem</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Potáhnutí dolů dotykovým perem</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Potáhnutí doleva dotykovým perem</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Potáhnutí doprava dotykovým perem</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Dlouhé stlačení dotykovým perem</string>
   <string name="touchscreen_gesture_action_dialog_title">Akce gest</string>
   <string name="touchscreen_gesture_action_do_nothing">Nedělat nic</string>
   <string name="touchscreen_gesture_action_flashlight">Přepnout svítilnu</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Přehrávat / pozastavit hudbu</string>
   <string name="touchscreen_gesture_action_previous_track">Přejít na předchozí skladbu</string>
   <string name="touchscreen_gesture_action_next_track">Přejít na další skladbu</string>
+  <string name="touchscreen_gesture_action_volume_down">Snížení hlasitosti médií</string>
+  <string name="touchscreen_gesture_action_volume_up">Zvýšení hlasitosti médií</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-csb-rPL/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-csb-rPL/plurals.xml b/res/values-csb/plurals.xml
similarity index 100%
rename from res/values-csb-rPL/plurals.xml
rename to res/values-csb/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-csb/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-csb/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-csb/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-cy/plurals.xml b/res/values-cy/plurals.xml
index 27ad002..206dfea 100644
--- a/res/values-cy/plurals.xml
+++ b/res/values-cy/plurals.xml
@@ -15,4 +15,21 @@
      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>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="backlight_timeout_time">
+    <item quantity="zero"><xliff:g id="seconds">%d</xliff:g> eiliadau</item>
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> eiliad</item>
+    <item quantity="two"><xliff:g id="seconds">%d</xliff:g> eiliad</item>
+    <item quantity="few"><xliff:g id="seconds">%d</xliff:g> eiliad</item>
+    <item quantity="many"><xliff:g id="seconds">%d</xliff:g> eiliad</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> eiliad</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="zero">%d o droeon</item>
+    <item quantity="one">unwaith</item>
+    <item quantity="two">dwywaith</item>
+    <item quantity="few">%d gwaith</item>
+    <item quantity="many">%d gwaith</item>
+    <item quantity="other">%d gwaith</item>
+  </plurals>
+</resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 1623acb..1d03274 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,26 +18,92 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <string name="loading">Yn llwytho\u2026</string>
+  <string name="dlg_ok">Iawn</string>
+  <string name="cancel">Canslo</string>
+  <string name="add">Ychwanegu</string>
+  <string name="choose_app">Dewisa ap</string>
+  <string name="reset">Ailosod</string>
+  <string name="advanced">Uwch</string>
+  <string name="settings">Gosodiadau</string>
+  <string name="name">Enw</string>
+  <string name="back">Nôl</string>
+  <string name="finish">Gorffen</string>
+  <string name="next">Nesaf</string>
+  <string name="on">Ymlaen</string>
+  <string name="off">I ffwrdd</string>
+  <string name="yes">Iawn</string>
+  <string name="no">Na</string>
+  <string name="search">Chwilio</string>
+  <string name="disabled">Wedi\'i analluogi</string>
+  <string name="enabled">Wedi\'i galluogi</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_title">Preifatrwydd</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_advanced_settings_title">Uwch</string>
+  <string name="privacy_guard_notification_title">Dangos hysbysiad</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">Addasu gosodiadau golau</string>
+  <string name="default_time">Arferol</string>
+  <string name="custom_time">Addasedig</string>
+  <string name="dialog_delete_title">Dileu</string>
+  <string name="dialog_delete_message">Tynnu\'r eitem dan sylw?</string>
+  <string name="brightness">Lefel disgleirdeb</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">Ymlaen o hyd</string>
+  <string name="pulse_length_very_short">Byr iawn</string>
+  <string name="pulse_length_short">Byr</string>
+  <string name="pulse_length_normal">Arferol</string>
+  <string name="pulse_length_long">Hir</string>
+  <string name="pulse_length_very_long">Hir iawn</string>
+  <string name="pulse_speed_very_fast">Cyflym iawn</string>
+  <string name="pulse_speed_fast">Cyflym</string>
+  <string name="pulse_speed_normal">Arferol</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
   <!-- LiveDisplay -->
+  <string name="live_display_color_profile_title">Proffil lliwiau</string>
+  <string name="live_display_color_profile_standard_title">Safonol</string>
+  <string name="live_display_color_profile_natural_title">Naturiol</string>
+  <string name="live_display_color_profile_dynamic_title">Deinamig</string>
+  <string name="live_display_color_profile_cinema_title">Sinema</string>
+  <string name="color_red_title">Coch</string>
+  <string name="color_green_title">Gwyrdd</string>
+  <string name="color_blue_title">Glas</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <!-- Button settings -->
+  <string name="hardware_keys_power_key_title">Botwm pŵer</string>
+  <string name="hardware_keys_home_key_title">Botwm cartref</string>
+  <string name="hardware_keys_back_key_title">Botwm nôl</string>
+  <string name="hardware_keys_menu_key_title">Botwm dewislen</string>
+  <string name="hardware_keys_assist_key_title">Botwm chwilio</string>
+  <string name="hardware_keys_appswitch_key_title">Botwm eitemau diweddar</string>
+  <string name="hardware_keys_camera_key_title">Botwm camera</string>
+  <string name="hardware_keys_volume_keys_title">Botymau uchder sain</string>
+  <string name="hardware_keys_short_press_title">Gweithred gwasgiad byr</string>
+  <string name="hardware_keys_long_press_title">Gweithred gwasgiad hir</string>
+  <string name="hardware_keys_double_tap_title">Gweithred tariad dwbl</string>
+  <string name="volbtn_cursor_control_off">Wedi\'i analluogi</string>
+  <string name="power_end_call_title">Gorffen yr Alwad</string>
+  <string name="volume_answer_call_title">Ateb galwad</string>
+  <string name="home_answer_call_title">Ateb galwad</string>
   <!-- Key backlight -->
   <!-- Buttons - Enable navbar -->
   <!-- Navigation Bar -->
   <!-- Power menu -->
   <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <string name="torch_long_press_power_timeout_1min">1 munud</string>
+  <string name="torch_long_press_power_timeout_2min">2 funud</string>
+  <string name="torch_long_press_power_timeout_10min">10 munud</string>
   <!-- Profiles -->
   <!-- Profile triggers -->
   <!-- Profiles settings  -->
   <!-- Profile mode options. -->
   <!-- Add Profile -->
+  <string name="new_profile_name">&lt;proffil newydd&gt;</string>
   <!-- Rename Dialog  -->
   <!-- Reset Profiles -->
   <!-- Delete confimation messages -->
@@ -59,16 +125,20 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <!-- Anonymous Statistics - Preview -->
   <!-- Display : Rotation  -->
+  <string name="display_rotation_180_title">180 gradd</string>
   <!-- Weather -->
   <!-- Power: Performance profiles -->
   <!-- Applications: Expanded desktop -->
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 999f354..e1c171b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS-indstillinger</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Indlæser\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Søg</string>
   <string name="disabled">Deaktiveret</string>
   <string name="enabled">Aktiveret</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privatliv</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Langsom</string>
   <string name="pulse_speed_very_slow">Meget langsom</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Batteri-LED</string>
   <string name="battery_low_pulse_title">Blink ved lavt batteriniveau</string>
@@ -216,14 +217,10 @@
   <string name="navigation_bar_home_double_tap_title">Handling ved dobbelt tryk på knappen Hjem</string>
   <!-- Power menu -->
   <string name="power_menu_title">Tænd/sluk-menu</string>
-  <string name="power_menu_reboot_title">Genstartsmenu</string>
   <string name="power_menu_screenshot_title">Screenshot</string>
   <string name="power_menu_airplane_title">Flytilstand</string>
   <string name="power_menu_users_title">Brugerskifter</string>
-  <string name="power_menu_settings_title">Genvej til Indstillinger</string>
-  <string name="power_menu_lockdown_title">Lås enheden</string>
   <string name="power_menu_bug_report_title">Fejlrapport</string>
-  <string name="power_menu_sound_title">Lydpanel</string>
   <string name="power_menu_bug_report_disabled">Fejlrapportering er deaktiveret i Indstillinger for udviklere</string>
   <string name="volume_keys_control_ring_stream_title">Regulér lydstyrke for ringetone</string>
   <string name="volume_keys_control_ring_stream_summary_on">Lydstyrkeknapper regulerer lydstyrken for ringetone</string>
@@ -422,6 +419,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statuslinje-ikoner</string>
   <string name="status_bar_icons_summary">Kontrollér, hvilke statuslinje-ikoner, der vises</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Beskyttede apps</string>
   <string name="protected_apps_manager_summary">Administrer, hvilke apps, der er skjult bag en sikker lås</string>
@@ -549,4 +547,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Afspilning/pause for musik</string>
   <string name="touchscreen_gesture_action_previous_track">Navigér til forrige musiknummer</string>
   <string name="touchscreen_gesture_action_next_track">Spring til næste musiknummer</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a479916..b442c96 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Suche</string>
   <string name="disabled">Deaktiviert</string>
   <string name="enabled">Aktiviert</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Datenschutz</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Standard</string>
   <string name="pulse_speed_slow">Langsam</string>
   <string name="pulse_speed_very_slow">Sehr langsam</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Helligkeitsstufen</string>
+  <string name="light_brightness_normal">Standard</string>
+  <string name="light_brightness_zen">Nicht stören</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Akku-LED</string>
   <string name="battery_low_pulse_title">Bei schwachem Akku pulsieren</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Eingehende Anrufe durch Drücken der Lautstärketaste annehmen</string>
   <string name="home_answer_call_title">Anruf beantworten</string>
   <string name="home_answer_call_summary">Eingehende Anrufe durch Drücken der Home-Taste annehmen</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Weitere Tasten</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Hintergrundbeleuchtung</string>
   <string name="button_backlight_enabled">Tasten beleuchten</string>
@@ -216,16 +223,13 @@
   <string name="navigation_bar_arrow_keys_summary">Beim Tippen Links/Rechts-Cursortasten anzeigen (deaktiviert die Eingabemethodenauswahl).</string>
   <string name="navigation_bar_home_long_press_title">Home (langes Drücken)</string>
   <string name="navigation_bar_home_double_tap_title">Home (doppeltes Tippen)</string>
+  <string name="navigation_bar_app_switch_long_press_title">Aktion für langes Drücken auf Anwendungsverlauf</string>
   <!-- Power menu -->
   <string name="power_menu_title">Ein-/Aus-Menü</string>
-  <string name="power_menu_reboot_title">Neustartmenü</string>
   <string name="power_menu_screenshot_title">Bildschirmfoto</string>
   <string name="power_menu_airplane_title">Flugmodus</string>
   <string name="power_menu_users_title">Benutzer wechseln</string>
-  <string name="power_menu_settings_title">Einstellungsverknüpfung</string>
-  <string name="power_menu_lockdown_title">Gerät sperren</string>
   <string name="power_menu_bug_report_title">Fehlerbericht</string>
-  <string name="power_menu_sound_title">Ton-Einstellungen</string>
   <string name="power_menu_bug_report_disabled">Fehlerberichte sind in Entwicklereinstellungen deaktiviert</string>
   <string name="volume_keys_control_ring_stream_title">Klingeltonlautstärke steuern</string>
   <string name="volume_keys_control_ring_stream_summary_on">Lautstärketasten steuern Klingeltonlautstärke</string>
@@ -429,6 +433,18 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statusleistensymbole</string>
   <string name="status_bar_icons_summary">Festlegen, welche Statusleistensymbole angezeigt werden</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_mode_title">Anzeigemodus</string>
+  <string name="network_traffic_mode_disable">Deaktiviert</string>
+  <string name="network_traffic_mode_up">Nur Upload</string>
+  <string name="network_traffic_mode_down">Nur Download</string>
+  <string name="network_traffic_mode_all">Upload und Download</string>
+  <string name="network_traffic_autohide">Automatisch ausblenden</string>
+  <string name="network_traffic_units_kilobits">Kilobits pro Sekunde (kbit/s)</string>
+  <string name="network_traffic_units_megabits">Megabits pro Sekunde (Mbit/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobyte pro Sekunde (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabyte pro Sekunde (MB/s)</string>
+  <string name="network_traffic_show_units">Einheiten anzeigen</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Geschützte Apps</string>
   <string name="protected_apps_manager_summary">Verwalten Sie, welche Apps hinter einer sicheren Sperre verborgen sind.</string>
@@ -451,7 +467,7 @@
   <string name="anonymous_statistics_title">LineageOS-Statistiken</string>
   <string name="anonymous_statistics_summary">Helfen Sie uns, LineageOS zu verbessern, indem Sie dem Sammeln anonymer Gerätestatistiken zustimmen.</string>
   <string name="anonymous_statistics_warning_title">Über</string>
-  <string name="anonymous_statistics_warning">Die Aktivierung der Lineage-Statistiken ermöglicht die Übertragung von nicht-personenbezogenen Daten an die Entwickler von LineageOS. Die bei jedem Neustart des Geräts übermittelten Daten beeinträchtigen nicht die Privatsphäre, da sie keinerlei Rückschlüsse auf den Benutzer zulassen.\n\nFür ein Beispiel der gesendeten Daten bitte auf \"Vorschau\" klicken.</string>
+  <string name="anonymous_statistics_warning">Die Aktivierung der LineageOS-Statistiken ermöglicht die Übertragung von nicht-personenbezogenen Daten an die Entwickler von LineageOS. Die bei jedem Neustart des Geräts übermittelten Daten beeinträchtigen nicht die Privatsphäre, da sie keinerlei Rückschlüsse auf den Benutzer zulassen.\n\nFür ein Beispiel der gesendeten Daten bitte auf \"Vorschau\" klicken.</string>
   <string name="enable_reporting_title">Berichte einschalten</string>
   <string name="preview_data_title">Vorschau</string>
   <string name="view_stats_title">Statistiken anzeigen</string>
@@ -545,6 +561,11 @@
   <string name="touchscreen_gesture_letter_w_title">Zeichnen Sie den Buchstaben \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Zeichnen Sie den Buchstaben \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Mit dem Stift nach oben wischen</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Mit dem Stift nach unten wischen</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Mit dem Stift nach links wischen</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Mit dem Stift nach rechts wischen</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Langes Drücken mit dem Stift</string>
   <string name="touchscreen_gesture_action_dialog_title">Gestenaktion</string>
   <string name="touchscreen_gesture_action_do_nothing">Nichts tun</string>
   <string name="touchscreen_gesture_action_flashlight">Taschenlampe ein-/ausschalten</string>
@@ -556,4 +577,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Musikwiedergabe starten/anhalten</string>
   <string name="touchscreen_gesture_action_previous_track">Zum vorherigen Musiktitel springen</string>
   <string name="touchscreen_gesture_action_next_track">Zum nächsten Musiktitel springen</string>
+  <string name="touchscreen_gesture_action_volume_down">Medienlautstärke verringern</string>
+  <string name="touchscreen_gesture_action_volume_up">Medienlautstärke erhöhen</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8e7a534..60e4603 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Αναζήτηση</string>
   <string name="disabled">Απενεργοποιημένο</string>
   <string name="enabled">Ενεργοποιημένο</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Απόρρητο</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Κανονική</string>
   <string name="pulse_speed_slow">Αργή</string>
   <string name="pulse_speed_very_slow">Πολύ αργή</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Επίπεδα φωτεινότητας</string>
+  <string name="light_brightness_normal">Κανονική</string>
+  <string name="light_brightness_zen">Μην ενοχλείτε</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Ένδειξη LED μπαταρίας</string>
   <string name="battery_low_pulse_title">Αναβόσβησε όταν η μπαταρία είναι χαμηλή</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Απάντηση σε εισερχόμενες κλήσεις πατώντας τα πλήκτρα έντασης</string>
   <string name="home_answer_call_title">Απάντηση κλήσης</string>
   <string name="home_answer_call_summary">Απάντηση σε εισερχόμενες κλήσεις πατώντας το πλήκτρο αρχικής οθόνης</string>
+  <string name="extras_title">Επιπλέον ρυθμίσεις</string>
+  <string name="additional_buttons_title">Πρόσθετα πλήκτρα</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Οπίσθιος φωτισμός</string>
   <string name="button_backlight_enabled">Φωτισμός πλήκτρων</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Εμφάνιση πλήκτρων αριστερού και δεξιού κέρσορα κατά την πληκτρολόγηση. Παρακάμπτει το εικονίδιο επιλογέα.</string>
   <string name="navigation_bar_home_long_press_title">Ενέργεια παρατεταμένης πίεσης αρχικής οθόνης</string>
   <string name="navigation_bar_home_double_tap_title">Ενέργεια διπλού χτυπήματος αρχικής οθόνης</string>
+  <string name="navigation_bar_app_switch_long_press_title">Ενέργεια παρατεταμένης πίεσης προσφάτων</string>
   <!-- Power menu -->
   <string name="power_menu_title">Μενού πλήκτρου απενεργοποίησης</string>
-  <string name="power_menu_reboot_title">Μενού επανεκκίνησης</string>
   <string name="power_menu_screenshot_title">Στιγμιότυπο οθόνης</string>
+  <string name="power_menu_screenshot_summary">Πιέστε παρατεταμένα για μερικό στιγμιότυπο οθόνης</string>
   <string name="power_menu_airplane_title">Λειτουργία πτήσης</string>
   <string name="power_menu_users_title">Εναλλαγή χρήστη</string>
-  <string name="power_menu_settings_title">Συντόμευση ρυθμίσεων</string>
-  <string name="power_menu_lockdown_title">Κλείδωμα συσκευής</string>
   <string name="power_menu_bug_report_title">Αναφορά σφαλμάτων</string>
-  <string name="power_menu_sound_title">Πάνελ έντασης</string>
   <string name="power_menu_bug_report_disabled">Η αναφορά σφαλμάτων είναι απενεργοποιημένη στις ρυθμίσεις για προγραμματιστές</string>
   <string name="volume_keys_control_ring_stream_title">Έλεγχος έντασης ήχου κλήσης</string>
   <string name="volume_keys_control_ring_stream_summary_on">Τα πλήκτρα έντασης θα ελέγχουν την ένταση ήχου κλήσης</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Εικονίδια γραμμής κατάστασης</string>
   <string name="status_bar_icons_summary">Ελέγξτε ποια εικονίδια θα εμφανίζονται στη γραμμή κατάστασης</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Εποπτεία της κίνησης δικτύου</string>
+  <string name="network_traffic_settings_summary">Να εμφανίζονται τα τρέχοντα επίπεδα κίνησης δικτύου στη γραμμή κατάστασης</string>
+  <string name="network_traffic_mode_title">Λειτουργία προβολής</string>
+  <string name="network_traffic_mode_disable">Ανενεργή</string>
+  <string name="network_traffic_mode_up">Μόνο αποστολή</string>
+  <string name="network_traffic_mode_down">Μόνο λήψη</string>
+  <string name="network_traffic_mode_all">Αποστολή και λήψη</string>
+  <string name="network_traffic_autohide">Αυτόματη απόκρυψη</string>
+  <string name="network_traffic_autohide_summary">Απόκρυψη κίνησης δικτύου όταν δεν υπάρχει δραστηριότητα</string>
+  <string name="network_traffic_units_title">Μονάδες μέτρησης κίνησης</string>
+  <string name="network_traffic_units_kilobits">Kilobit ανά δευτερόλεπτο (kb/δ)</string>
+  <string name="network_traffic_units_megabits">Megabit ανά δευτερόλεπτο (Mb/δ)</string>
+  <string name="network_traffic_units_kilobytes">Kilobyte ανά δευτερόλεπτο (kB/δ)</string>
+  <string name="network_traffic_units_megabytes">Megabyte ανά δευτερόλεπτο (MB/δ)</string>
+  <string name="network_traffic_show_units">Εμφάνιση μονάδων</string>
+  <string name="network_traffic_show_units_summary">Επιλέξτε αν θα εμφανίζονται οι μονάδες μέτρησης κίνησης στη γραμμή κατάστασης</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Προστατευμένες εφαρμογές</string>
   <string name="protected_apps_manager_summary">Διαχειριστείτε ποιές εφαρμογές θα είναι κρυμμένες πίσω από ένα ασφαλές κλείδωμα</string>
@@ -549,6 +571,11 @@
   <string name="touchscreen_gesture_letter_w_title">Σχεδιάστε το γράμμα «W»</string>
   <string name="touchscreen_gesture_letter_z_title">Σχεδιάστε το γράμμα «Z»</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Σύρετε προς τα επάνω με τη γραφίδα</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Σύρετε προς τα κάτω με τη γραφίδα</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Σύρετε προς τα αριστερά με τη γραφίδα</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Σύρετε προς τα δεξιά με τη γραφίδα</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Παρατεταμένη πίεση με τη γραφίδα</string>
   <string name="touchscreen_gesture_action_dialog_title">Ενέργεια χειρονομίας</string>
   <string name="touchscreen_gesture_action_do_nothing">Καμία ενέργεια</string>
   <string name="touchscreen_gesture_action_flashlight">Εναλλαγή φακού</string>
@@ -560,4 +587,24 @@
   <string name="touchscreen_gesture_action_play_pause_music">Αναπαραγωγή/παύση μουσικής</string>
   <string name="touchscreen_gesture_action_previous_track">Μεταβείτε στο προηγούμενο κομμάτι μουσικής</string>
   <string name="touchscreen_gesture_action_next_track">Μετάβαση στο επόμενο κομμάτι μουσικής</string>
+  <string name="touchscreen_gesture_action_volume_down">Μείωση έντασης πολυμέσων</string>
+  <string name="touchscreen_gesture_action_volume_up">Αύξηση έντασης πολυμέσων</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
+  <string name="style_title">Στυλ</string>
+  <string name="style_summary">Επιλέξτε χρώματα συστήματος</string>
+  <string name="style_global_title">Στυλ</string>
+  <string name="style_global_entry_automatic">Αυτόματο (ταπετσαρία)</string>
+  <string name="style_global_entry_light">Φωτεινό</string>
+  <string name="style_global_entry_dark">Σκοτεινό</string>
+  <string name="style_global_entry_time">Αυτόματο (ώρα της ημέρας)</string>
+  <string name="style_accent_title">Δευτερεύον χρώμα</string>
+  <string name="style_accent_configuration_not_supported">Το τρέχον δευτερεύον χρώμα δεν είναι συμβατό με το επιλεγμένο στυλ. Για να συνεχίσετε πρέπει να επιλεγεί ένα άλλο δευτερεύον χρώμα, είστε βέβαιοι ότι θέλετε να συνεχίσετε;</string>
+  <string name="style_accent_configuration_positive">Συνέχεια</string>
+  <string name="style_automagic_title">Automagic</string>
+  <string name="style_automagic_description">Προσαρμόστε το στυλ για να ταιριάζει με την ταπετσαρία σας</string>
+  <string name="style_automagic_dialog_content">Προτεινόμενο στυλ: <b>%1$s</b> με δευτερεύον χρώμα: <b>%2$s</b>.\nΘέλετε να το εφαρμόσετε;</string>
+  <string name="style_automagic_dialog_positive">Εφαρμογή</string>
+  <string name="style_accent_default_name">Προεπιλογή</string>
+  <string name="style_permission_error">Το δικαίωμα πρόσβασης αποθηκευτικού χώρου είναι απαραίτητο για την ανάλυση της ταπετσαρίας σας, παρακαλώ χορηγήστε το για να χρησιμοποιήσετε αυτήν τη δυνατότητα</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index cace182..e76015d 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Search</string>
   <string name="disabled">Disabled</string>
   <string name="enabled">Enabled</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacy</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Slow</string>
   <string name="pulse_speed_very_slow">Very slow</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Brightness levels</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Do Not Disturb</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Battery light</string>
   <string name="battery_low_pulse_title">Pulse if battery low</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Answer incoming calls by pressing the volume buttons</string>
   <string name="home_answer_call_title">Answer call</string>
   <string name="home_answer_call_summary">Answer incoming calls by pressing the home button</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Additional buttons</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Backlight</string>
   <string name="button_backlight_enabled">Illuminate buttons</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Display left and right cursor buttons while typing. Overrides IME switcher.</string>
   <string name="navigation_bar_home_long_press_title">Home long press action</string>
   <string name="navigation_bar_home_double_tap_title">Home double tap action</string>
+  <string name="navigation_bar_app_switch_long_press_title">Recents long press action</string>
   <!-- Power menu -->
   <string name="power_menu_title">Power menu</string>
-  <string name="power_menu_reboot_title">Restart menu</string>
   <string name="power_menu_screenshot_title">Screenshot</string>
+  <string name="power_menu_screenshot_summary">Long-press for partial screenshot</string>
   <string name="power_menu_airplane_title">Aeroplane mode</string>
   <string name="power_menu_users_title">User switcher</string>
-  <string name="power_menu_settings_title">Settings shortcut</string>
-  <string name="power_menu_lockdown_title">Device lockdown</string>
   <string name="power_menu_bug_report_title">Bug report</string>
-  <string name="power_menu_sound_title">Sound panel</string>
   <string name="power_menu_bug_report_disabled">Bug reporting is disabled in development settings</string>
   <string name="volume_keys_control_ring_stream_title">Control ringtone volume</string>
   <string name="volume_keys_control_ring_stream_summary_on">Volume keys control ringtone volume</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Status bar icons</string>
   <string name="status_bar_icons_summary">Control which status bar icons are shown</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Network traffic monitor</string>
+  <string name="network_traffic_settings_summary">Show current network traffic levels in the status bar</string>
+  <string name="network_traffic_mode_title">Display mode</string>
+  <string name="network_traffic_mode_disable">Disabled</string>
+  <string name="network_traffic_mode_up">Upload only</string>
+  <string name="network_traffic_mode_down">Download only</string>
+  <string name="network_traffic_mode_all">Upload and download</string>
+  <string name="network_traffic_autohide">Auto hide</string>
+  <string name="network_traffic_autohide_summary">Hide the traffic monitor when there is no activity</string>
+  <string name="network_traffic_units_title">Traffic measurement units</string>
+  <string name="network_traffic_units_kilobits">Kilobits per second (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits per second (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes per second (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes per second (MB/s)</string>
+  <string name="network_traffic_show_units">Show units</string>
+  <string name="network_traffic_show_units_summary">Whether to show traffic measurement units in the statusbar</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Protected apps</string>
   <string name="protected_apps_manager_summary">Manage which apps are hidden behind a secure lock</string>
@@ -547,6 +569,11 @@
   <string name="touchscreen_gesture_letter_w_title">Draw the letter \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Draw the letter \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Swipe up with the stylus</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Swipe down with the stylus</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Swipe left with the stylus</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Swipe right with the stylus</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Long press with the stylus</string>
   <string name="touchscreen_gesture_action_dialog_title">Gesture action</string>
   <string name="touchscreen_gesture_action_do_nothing">Do nothing</string>
   <string name="touchscreen_gesture_action_flashlight">Toggle the torch</string>
@@ -558,4 +585,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Play/pause music playback</string>
   <string name="touchscreen_gesture_action_previous_track">Navigate to the previous music track</string>
   <string name="touchscreen_gesture_action_next_track">Skip to the next music track</string>
+  <string name="touchscreen_gesture_action_volume_down">Lower media volume</string>
+  <string name="touchscreen_gesture_action_volume_up">Raise media volume</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-bs-rBA/plurals.xml b/res/values-en-rCA/plurals.xml
similarity index 100%
copy from res/values-bs-rBA/plurals.xml
copy to res/values-en-rCA/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-en-rCA/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-en-rCA/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c5b0274..a0f82d5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Search</string>
   <string name="disabled">Disabled</string>
   <string name="enabled">Enabled</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacy</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Slow</string>
   <string name="pulse_speed_very_slow">Very slow</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Brightness levels</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Do Not Disturb</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Battery light</string>
   <string name="battery_low_pulse_title">Pulse if battery low</string>
@@ -136,6 +141,8 @@
   <string name="live_display_color_profile_reading_summary">Warmer colours for less eyestrain</string>
   <string name="live_display_color_profile_srgb_title">sRGB</string>
   <string name="live_display_color_profile_srgb_summary">Colours accurate to the sRGB colour space</string>
+  <string name="live_display_color_profile_dci_p3_title">DCI-P3</string>
+  <string name="live_display_color_profile_dci_p3_summary">Colours accurate to the DCI-P3 colour space</string>
   <string name="color_calibration_title">Colour calibration</string>
   <string name="color_calibration_summary">Calibrate on-screen colours</string>
   <string name="color_red_title">Red</string>
@@ -192,6 +199,8 @@
   <string name="volume_answer_call_summary">Answer incoming calls by pressing the volume buttons</string>
   <string name="home_answer_call_title">Answer call</string>
   <string name="home_answer_call_summary">Answer incoming calls by pressing the home button</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Additional buttons</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Backlight</string>
   <string name="button_backlight_enabled">Illuminate buttons</string>
@@ -214,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Display left and right cursor buttons while typing. Overrides IME switcher.</string>
   <string name="navigation_bar_home_long_press_title">Home long press action</string>
   <string name="navigation_bar_home_double_tap_title">Home double tap action</string>
+  <string name="navigation_bar_app_switch_long_press_title">Recents long press action</string>
   <!-- Power menu -->
   <string name="power_menu_title">Power menu</string>
-  <string name="power_menu_reboot_title">Restart menu</string>
   <string name="power_menu_screenshot_title">Screenshot</string>
+  <string name="power_menu_screenshot_summary">Long-press for partial screenshot</string>
   <string name="power_menu_airplane_title">Aeroplane mode</string>
   <string name="power_menu_users_title">User switcher</string>
-  <string name="power_menu_settings_title">Settings shortcut</string>
-  <string name="power_menu_lockdown_title">Device lockdown</string>
   <string name="power_menu_bug_report_title">Bug report</string>
-  <string name="power_menu_sound_title">Sound panel</string>
   <string name="power_menu_bug_report_disabled">Bug reporting is disabled in development settings</string>
   <string name="volume_keys_control_ring_stream_title">Control ringtone volume</string>
   <string name="volume_keys_control_ring_stream_summary_on">Volume keys control ringtone volume</string>
@@ -427,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Status bar icons</string>
   <string name="status_bar_icons_summary">Control which status bar icons are shown</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Network traffic monitor</string>
+  <string name="network_traffic_settings_summary">Show current network traffic levels in the status bar</string>
+  <string name="network_traffic_mode_title">Display mode</string>
+  <string name="network_traffic_mode_disable">Disabled</string>
+  <string name="network_traffic_mode_up">Upload only</string>
+  <string name="network_traffic_mode_down">Download only</string>
+  <string name="network_traffic_mode_all">Upload and download</string>
+  <string name="network_traffic_autohide">Auto hide</string>
+  <string name="network_traffic_autohide_summary">Hide the traffic monitor when there is no activity</string>
+  <string name="network_traffic_units_title">Traffic measurement units</string>
+  <string name="network_traffic_units_kilobits">Kilobits per second (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits per second (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes per second (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes per second (MB/s)</string>
+  <string name="network_traffic_show_units">Show units</string>
+  <string name="network_traffic_show_units_summary">Whether to show traffic measurement units in the statusbar</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Protected apps</string>
   <string name="protected_apps_manager_summary">Manage which apps are hidden behind a secure lock</string>
@@ -545,6 +569,11 @@
   <string name="touchscreen_gesture_letter_w_title">Draw the letter \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Draw the letter \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Swipe up with the stylus</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Swipe down with the stylus</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Swipe left with the stylus</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Swipe right with the stylus</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Long press with the stylus</string>
   <string name="touchscreen_gesture_action_dialog_title">Gesture action</string>
   <string name="touchscreen_gesture_action_do_nothing">Do nothing</string>
   <string name="touchscreen_gesture_action_flashlight">Toggle the flashlight</string>
@@ -556,4 +585,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Play/pause music playback</string>
   <string name="touchscreen_gesture_action_previous_track">Navigate to the previous music track</string>
   <string name="touchscreen_gesture_action_next_track">Skip to the next music track</string>
+  <string name="touchscreen_gesture_action_volume_down">Lower media volume</string>
+  <string name="touchscreen_gesture_action_volume_up">Raise media volume</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index efcf1bb..a6c5b83 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Search</string>
   <string name="disabled">Disabled</string>
   <string name="enabled">Enabled</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacy</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Slow</string>
   <string name="pulse_speed_very_slow">Very slow</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Brightness levels</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Do Not Disturb</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Battery light</string>
   <string name="battery_low_pulse_title">Pulse if battery low</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Answer incoming calls by pressing the volume buttons</string>
   <string name="home_answer_call_title">Answer call</string>
   <string name="home_answer_call_summary">Answer incoming calls by pressing the home button</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Additional buttons</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Backlight</string>
   <string name="button_backlight_enabled">Illuminate buttons</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Display left and right cursor buttons while typing. Overrides IME switcher.</string>
   <string name="navigation_bar_home_long_press_title">Home long press action</string>
   <string name="navigation_bar_home_double_tap_title">Home double tap action</string>
+  <string name="navigation_bar_app_switch_long_press_title">Recents long press action</string>
   <!-- Power menu -->
   <string name="power_menu_title">Power menu</string>
-  <string name="power_menu_reboot_title">Restart menu</string>
   <string name="power_menu_screenshot_title">Screenshot</string>
+  <string name="power_menu_screenshot_summary">Long-press for partial screenshot</string>
   <string name="power_menu_airplane_title">Aeroplane mode</string>
   <string name="power_menu_users_title">User switcher</string>
-  <string name="power_menu_settings_title">Settings shortcut</string>
-  <string name="power_menu_lockdown_title">Device lockdown</string>
   <string name="power_menu_bug_report_title">Bug report</string>
-  <string name="power_menu_sound_title">Sound panel</string>
   <string name="power_menu_bug_report_disabled">Bug reporting is disabled in development settings</string>
   <string name="volume_keys_control_ring_stream_title">Control ringtone volume</string>
   <string name="volume_keys_control_ring_stream_summary_on">Volume keys control ringtone volume</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Status bar icons</string>
   <string name="status_bar_icons_summary">Control which status bar icons are shown</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Network traffic monitor</string>
+  <string name="network_traffic_settings_summary">Show current network traffic levels in the status bar</string>
+  <string name="network_traffic_mode_title">Display mode</string>
+  <string name="network_traffic_mode_disable">Disabled</string>
+  <string name="network_traffic_mode_up">Upload only</string>
+  <string name="network_traffic_mode_down">Download only</string>
+  <string name="network_traffic_mode_all">Upload and download</string>
+  <string name="network_traffic_autohide">Auto hide</string>
+  <string name="network_traffic_autohide_summary">Hide the traffic monitor when there is no activity</string>
+  <string name="network_traffic_units_title">Traffic measurement units</string>
+  <string name="network_traffic_units_kilobits">Kilobits per second (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits per second (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes per second (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes per second (MB/s)</string>
+  <string name="network_traffic_show_units">Show units</string>
+  <string name="network_traffic_show_units_summary">Whether to show traffic measurement units in the statusbar</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Protected apps</string>
   <string name="protected_apps_manager_summary">Manage which apps are hidden behind a secure lock</string>
@@ -547,6 +569,11 @@
   <string name="touchscreen_gesture_letter_w_title">Draw the letter \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Draw the letter \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Swipe up with the stylus</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Swipe down with the stylus</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Swipe left with the stylus</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Swipe right with the stylus</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Long press with the stylus</string>
   <string name="touchscreen_gesture_action_dialog_title">Gesture action</string>
   <string name="touchscreen_gesture_action_do_nothing">Do nothing</string>
   <string name="touchscreen_gesture_action_flashlight">Toggle the torch</string>
@@ -558,4 +585,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Play/pause music playback</string>
   <string name="touchscreen_gesture_action_previous_track">Navigate to the previous music track</string>
   <string name="touchscreen_gesture_action_next_track">Skip to the next music track</string>
+  <string name="touchscreen_gesture_action_volume_down">Lower media volume</string>
+  <string name="touchscreen_gesture_action_volume_up">Raise media volume</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 086bff7..84485f3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Buscar</string>
   <string name="disabled">Desactivado</string>
   <string name="enabled">Activado</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacidad</string>
   <!-- Privacy Guard -->
@@ -45,7 +46,7 @@
   <string name="privacy_guard_dlg_title">¿Activar Guardián de privacidad?</string>
   <string name="privacy_guard_dlg_text">Mientras esté activado «Guardián de privacidad», la aplicación no podrá acceder a los datos personales, tales como contactos, mensajes o registros de llamadas.</string>
   <string name="privacy_guard_dlg_system_app_text">Mientras esté activado «Guardián de privacidad» para una aplicación del sistema, la aplicación no podrá acceder a los datos personales, tales como contactos, mensajes o registros de llamadas. Esto puede causar un comportamiento anómalo en otras aplicaciones.</string>
-  <string name="privacy_guard_default_title">Activado por defecto</string>
+  <string name="privacy_guard_default_title">Activado de forma predefinida</string>
   <string name="privacy_guard_manager_summary">Gestionar las aplicaciones que accederán a los datos personales</string>
   <string name="privacy_guard_no_user_apps">Sin aplicaciones instaladas</string>
   <string name="privacy_guard_help_title">Ayuda</string>
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lenta</string>
   <string name="pulse_speed_very_slow">Muy lenta</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Niveles de brillo</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">No molestar</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Indicador de batería</string>
   <string name="battery_low_pulse_title">Parpadear con batería baja</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Contestar llamadas entrantes presionando los botones de volumen</string>
   <string name="home_answer_call_title">Contestar la llamada</string>
   <string name="home_answer_call_summary">Contestar llamadas entrantes presionando el botón de inicio</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Botones adicionales</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Contraluz</string>
   <string name="button_backlight_enabled">Iluminar botones</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Mostrar el botón izquierdo y derecho del cursor al escribir. Reemplaza al selector IME.</string>
   <string name="navigation_bar_home_long_press_title">Acción de pulsación larga en Inicio</string>
   <string name="navigation_bar_home_double_tap_title">Acción de doble pulsación en Inicio</string>
+  <string name="navigation_bar_app_switch_long_press_title">Últimas acciones de pulsación larga</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menú de apagado</string>
-  <string name="power_menu_reboot_title">Menú de reinicio</string>
   <string name="power_menu_screenshot_title">Captura de pantalla</string>
+  <string name="power_menu_screenshot_summary">Mantener pulsado para una captura de pantalla parcial</string>
   <string name="power_menu_airplane_title">Modo avión</string>
   <string name="power_menu_users_title">Selector de usuario</string>
-  <string name="power_menu_settings_title">Atajo de ajustes</string>
-  <string name="power_menu_lockdown_title">Bloqueo del dispositivo</string>
   <string name="power_menu_bug_report_title">Informe de errores</string>
-  <string name="power_menu_sound_title">Panel de sonido</string>
   <string name="power_menu_bug_report_disabled">Los informes de error están desactivados en los ajustes de desarrollo</string>
   <string name="volume_keys_control_ring_stream_title">Controlar el volumen del tono de llamada</string>
   <string name="volume_keys_control_ring_stream_summary_on">Las teclas de volumen controlan el volumen del tono de llamada</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Iconos de la barra de estado</string>
   <string name="status_bar_icons_summary">Controlar qué iconos aparecen en la barra de estado</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitor de tráfico de red</string>
+  <string name="network_traffic_settings_summary">Muestra los niveles de tráfico de red actuales en la barra de estado</string>
+  <string name="network_traffic_mode_title">Modo de visualización</string>
+  <string name="network_traffic_mode_disable">Desactivado</string>
+  <string name="network_traffic_mode_up">Sólo subida</string>
+  <string name="network_traffic_mode_down">Sólo descarga</string>
+  <string name="network_traffic_mode_all">Subida y descarga</string>
+  <string name="network_traffic_autohide">Ocultar automáticamente</string>
+  <string name="network_traffic_autohide_summary">Ocultar el monitor de tráfico cuando no haya actividad</string>
+  <string name="network_traffic_units_title">Unidades de medida de tráfico</string>
+  <string name="network_traffic_units_kilobits">Kilobits por segundo (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits por segundo (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes por segundo (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes por segundo (MB/s)</string>
+  <string name="network_traffic_show_units">Mostrar unidades</string>
+  <string name="network_traffic_show_units_summary">Mostrar/ocultar unidades de medida de tráfico en la barra de estado</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicaciones protegidas</string>
   <string name="protected_apps_manager_summary">Gestionar que aplicaciones se ocultarán detrás de un bloqueo seguro</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Dibujar la letra «W»</string>
   <string name="touchscreen_gesture_letter_z_title">Dibujar la letra «Z»</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Deslizar encima con el lápiz táctil</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Deslizar debajo con el lápiz táctil</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Deslizar a la izquierda con el lápiz táctil</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Deslizar a la derecha con el lápiz táctil</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Mantén pulsado con el lápiz táctil</string>
   <string name="touchscreen_gesture_action_dialog_title">Acción del gesto</string>
   <string name="touchscreen_gesture_action_do_nothing">No hacer nada</string>
   <string name="touchscreen_gesture_action_flashlight">Alternar linterna</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reproducir/pausar reproducción de música</string>
   <string name="touchscreen_gesture_action_previous_track">Desplácese hasta la pista de música anterior</string>
   <string name="touchscreen_gesture_action_next_track">Saltar a la siguiente pista de música</string>
+  <string name="touchscreen_gesture_action_volume_down">Reducir volumen de multimedia</string>
+  <string name="touchscreen_gesture_action_volume_up">Aumentar volumen de multimedia</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index afd086b..92ea86d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,7 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Configuración de LineageOS</string>
+  <string name="lineageparts_title">Ajustes de LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Cargando\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +38,7 @@
   <string name="search">Buscar</string>
   <string name="disabled">Deshabilitada</string>
   <string name="enabled">Activo</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacidad</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lenta</string>
   <string name="pulse_speed_very_slow">Muy lenta</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Niveles de brillo</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">No Molestar</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Indicador de batería</string>
   <string name="battery_low_pulse_title">Parpadear con batería baja</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Contestar llamadas entrantes presionando los botones de volumen</string>
   <string name="home_answer_call_title">Contestar la llamada</string>
   <string name="home_answer_call_summary">Contestar llamadas entrantes presionando el botón de inicio</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Botones adicionales</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Contraluz</string>
   <string name="button_backlight_enabled">Iluminar botones</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Mostrar los cursores izquierda y derecha durante la escritura. Modifica al selector IME.</string>
   <string name="navigation_bar_home_long_press_title">Acción de pulsación larga en inicio</string>
   <string name="navigation_bar_home_double_tap_title">Acción de doble toque en inicio</string>
+  <string name="navigation_bar_app_switch_long_press_title">Acción de pulsación larga en recientes</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menú de apagado</string>
-  <string name="power_menu_reboot_title">Menú de reinicio</string>
   <string name="power_menu_screenshot_title">Captura de pantalla</string>
+  <string name="power_menu_screenshot_summary">Pulsación larga para captura de pantalla parcial</string>
   <string name="power_menu_airplane_title">Modo avión</string>
   <string name="power_menu_users_title">Selector de usuario</string>
-  <string name="power_menu_settings_title">Atajo de configuración</string>
-  <string name="power_menu_lockdown_title">Bloqueo del dispositivo</string>
   <string name="power_menu_bug_report_title">Informe de errores</string>
-  <string name="power_menu_sound_title">Panel de sonido</string>
   <string name="power_menu_bug_report_disabled">Los informes de error están desactivados en las configuraciones de desarrollo</string>
   <string name="volume_keys_control_ring_stream_title">Control del volumen del tono de llamada</string>
   <string name="volume_keys_control_ring_stream_summary_on">Las teclas de volumen controlan el volumen del tono de llamada</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Iconos de la barra de estado</string>
   <string name="status_bar_icons_summary">Elija los iconos que aparecerán en la barra de estado</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitor de tráfico de red</string>
+  <string name="network_traffic_settings_summary">Muestra los niveles de tráfico de red actuales en la barra de estado</string>
+  <string name="network_traffic_mode_title">Modo de visualización</string>
+  <string name="network_traffic_mode_disable">Deshabilitado</string>
+  <string name="network_traffic_mode_up">Sólo subida</string>
+  <string name="network_traffic_mode_down">Sólo descarga</string>
+  <string name="network_traffic_mode_all">Subida y descarga</string>
+  <string name="network_traffic_autohide">Ocultar automáticamente</string>
+  <string name="network_traffic_autohide_summary">Ocultar el monitor de tráfico cuando no hay actividad</string>
+  <string name="network_traffic_units_title">Unidades de medida de tráfico</string>
+  <string name="network_traffic_units_kilobits">Kilobits por segundo (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits por segundo (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes por segundo (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes por segundo (MB/s)</string>
+  <string name="network_traffic_show_units">Mostrar unidades</string>
+  <string name="network_traffic_show_units_summary">Mostrar/ocultar unidades de medida de tráfico en la barra de estado</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicaciones protegidas</string>
   <string name="protected_apps_manager_summary">Gestionar que aplicaciones se ocultarán detrás de un bloqueo seguro</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Dibujar la letra «W»</string>
   <string name="touchscreen_gesture_letter_z_title">Dibujar la letra «Z»</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Deslice hacia arriba con el lápiz</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Deslice hacia abajo con el lápiz</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Deslice hacia la izquierda con el lápiz</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Deslice hacia la derecha con el lápiz</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Pulsación prolongada con el lápiz</string>
   <string name="touchscreen_gesture_action_dialog_title">Acción del gesto</string>
   <string name="touchscreen_gesture_action_do_nothing">No hacer nada</string>
   <string name="touchscreen_gesture_action_flashlight">Activar/Desactivar linterna</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reproducir/pausar reproducción de música</string>
   <string name="touchscreen_gesture_action_previous_track">Desplácese hasta la pista de música anterior</string>
   <string name="touchscreen_gesture_action_next_track">Saltar a la siguiente pista de música</string>
+  <string name="touchscreen_gesture_action_volume_down">Menor volumen multimedia</string>
+  <string name="touchscreen_gesture_action_volume_up">Mayor volumen multimedia</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-et-rEE/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-et-rEE/plurals.xml b/res/values-et/plurals.xml
similarity index 100%
rename from res/values-et-rEE/plurals.xml
rename to res/values-et/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-et/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-et/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-et/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-eu-rES/plurals.xml b/res/values-eu/plurals.xml
similarity index 100%
rename from res/values-eu-rES/plurals.xml
rename to res/values-eu/plurals.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 97%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
index 34f439b..75e52a2 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS ezarpenak</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Kargatzen\u2026</string>
   <string name="dlg_ok">Ados</string>
@@ -38,6 +37,7 @@
   <string name="search">Bilatu</string>
   <string name="disabled">Desgaituta</string>
   <string name="enabled">Gaituta</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Pribatutasuna</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Arrunta</string>
   <string name="pulse_speed_slow">Motela</string>
   <string name="pulse_speed_very_slow">Oso motela</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Bateria adierazlea</string>
   <string name="battery_low_pulse_title">Led-a bateria baxu dagoenean</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Hasiera botoian birritan sakatzearen ekintza</string>
   <!-- Power menu -->
   <string name="power_menu_title">Itzaltze menua</string>
-  <string name="power_menu_reboot_title">Berrabiarazte menua</string>
   <string name="power_menu_screenshot_title">Pantaila-argazkia</string>
   <string name="power_menu_airplane_title">Hegaldi modua</string>
   <string name="power_menu_users_title">Erabiltzaile aldaketa</string>
-  <string name="power_menu_settings_title">Ezarpenetara lasterbidea</string>
-  <string name="power_menu_lockdown_title">Gailuaren blokeoa</string>
   <string name="power_menu_bug_report_title">Errore-txostena</string>
-  <string name="power_menu_sound_title">Soinu-panela</string>
   <string name="power_menu_bug_report_disabled">Erroreen berri ematea ezgaituta dago garatzaileen aukeretan</string>
   <string name="volume_keys_control_ring_stream_title">Kontrolatu dei-doinuaren bolumena</string>
   <string name="volume_keys_control_ring_stream_summary_on">Bolumen teklek dei-doinuaren bolumena kontrolatzen dute</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Egoera-barrako ikonoak</string>
   <string name="status_bar_icons_summary">Kontrolatu egoera-barran agertuko diren ikonoak</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Babesturiko aplikazioak</string>
   <string name="protected_apps_manager_summary">Kudeatu blokeo ziurrarekin ezkutatuko diren aplikazioak</string>
@@ -546,6 +544,11 @@
   <string name="touchscreen_gesture_letter_w_title">Marraztu \"W\" letra</string>
   <string name="touchscreen_gesture_letter_z_title">Marraztu \"Z\" letra</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Pasatu luma gora</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Pasatu luma behera</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Pasatu luma eskerrera</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Pasatu luma eskuinera</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Sakatu luze lumarekin</string>
   <string name="touchscreen_gesture_action_dialog_title">Keinuaren ekintza</string>
   <string name="touchscreen_gesture_action_do_nothing">Ez egin ezer</string>
   <string name="touchscreen_gesture_action_flashlight">Piztu/itzali linterna</string>
@@ -557,4 +560,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Abiatu/pausatu musikaren erreprodukzioa</string>
   <string name="touchscreen_gesture_action_previous_track">Joan aurreko musika pistara</string>
   <string name="touchscreen_gesture_action_next_track">Joan hurrengo musika pistara</string>
+  <string name="touchscreen_gesture_action_volume_down">Jaitsi multimediaren bolumena</string>
+  <string name="touchscreen_gesture_action_volume_up">Igo multimediaren bolumena</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 43ea260..1704518 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS Asetukset</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Ladataan\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Etsi</string>
   <string name="disabled">Pois käytöstä</string>
   <string name="enabled">Käytössä</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Tietosuoja</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normaali</string>
   <string name="pulse_speed_slow">Hidas</string>
   <string name="pulse_speed_very_slow">Erittäin hidas</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Akun valo</string>
   <string name="battery_low_pulse_title">Vilku jos akku lähes tyhjä</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Kotinäppäimen kaksoisnapautuksen tehtävä</string>
   <!-- Power menu -->
   <string name="power_menu_title">Käynnistysvalikko</string>
-  <string name="power_menu_reboot_title">Uudelleenkäynnistysvalikko</string>
   <string name="power_menu_screenshot_title">Kuvakaappaus</string>
   <string name="power_menu_airplane_title">Lentotila</string>
   <string name="power_menu_users_title">Käyttäjän vaihto</string>
-  <string name="power_menu_settings_title">Asetusten pikakuvake</string>
-  <string name="power_menu_lockdown_title">Laitteen lukitus</string>
   <string name="power_menu_bug_report_title">Virheraportti</string>
-  <string name="power_menu_sound_title">Äänipaneeli</string>
   <string name="power_menu_bug_report_disabled">Virheraportointi on poistettu käytöstä kehittäjäasetuksista</string>
   <string name="volume_keys_control_ring_stream_title">Ohjaa soittoäänen äänenvoimakkuutta</string>
   <string name="volume_keys_control_ring_stream_summary_on">Soittoäänen voimakkuuden ohjaus äänenvoimakkuusnäppäimillä</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Tilapalkin kuvakkeet</string>
   <string name="status_bar_icons_summary">Määritä mitkä tilapalkin kuvakkeet näytetään</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Suojatut sovellukset</string>
   <string name="protected_apps_manager_summary">Hallitse mitkä sovellukset ovat turvallisen lukituksen takana</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Toista/Keskeytä musiikki</string>
   <string name="touchscreen_gesture_action_previous_track">Siirry edelliseen musiikkikappaleeseen</string>
   <string name="touchscreen_gesture_action_next_track">Siirry seuraavaan musiikkikappaleeseen</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-fil-rPH/strings.xml b/res/values-fil-rPH/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-fil-rPH/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-fil-rPH/plurals.xml b/res/values-fil/plurals.xml
similarity index 100%
rename from res/values-fil-rPH/plurals.xml
rename to res/values-fil/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-fil/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-fil/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-fil/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index afb1e3e..02f947f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Rechercher</string>
   <string name="disabled">Désactivé</string>
   <string name="enabled">Activé</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Confidentialité</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normale</string>
   <string name="pulse_speed_slow">Lente</string>
   <string name="pulse_speed_very_slow">Très lente</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Niveau de luminosité</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Ne pas déranger</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Voyant batterie</string>
   <string name="battery_low_pulse_title">Clignoter si la batterie est faible</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Accepter les appels entrants en appuyant sur les touches de volume</string>
   <string name="home_answer_call_title">Répondre à l\'appel</string>
   <string name="home_answer_call_summary">Répondre aux appels entrants en appuyant sur le bouton d\'accueil</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Boutons supplémentaires</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Rétro-éclairage</string>
   <string name="button_backlight_enabled">Rétroéclairage des boutons</string>
@@ -218,14 +225,10 @@
   <string name="navigation_bar_home_double_tap_title">Appui double sur bouton d\'accueil</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menu marche/arrêt</string>
-  <string name="power_menu_reboot_title">Menu redémarrer</string>
   <string name="power_menu_screenshot_title">Capture d\'écran</string>
   <string name="power_menu_airplane_title">Mode Avion</string>
   <string name="power_menu_users_title">Changer d\'utilisateur</string>
-  <string name="power_menu_settings_title">Raccourci vers les paramètres</string>
-  <string name="power_menu_lockdown_title">Verrouillage de l\'appareil</string>
   <string name="power_menu_bug_report_title">Rapport de bug</string>
-  <string name="power_menu_sound_title">Panneau du son</string>
   <string name="power_menu_bug_report_disabled">Le rapport de bug est désactivé dans les paramètres de développement</string>
   <string name="volume_keys_control_ring_stream_title">Contrôler le volume de la sonnerie</string>
   <string name="volume_keys_control_ring_stream_summary_on">Les touches du volume contrôlent le volume de la sonnerie</string>
@@ -429,6 +432,14 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Icônes de la barre d\'état</string>
   <string name="status_bar_icons_summary">Choisir les icônes affichées dans la barre d\'état</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Moniteur de trafic réseau</string>
+  <string name="network_traffic_mode_title">Mode d\'affichage</string>
+  <string name="network_traffic_mode_disable">Désactivé</string>
+  <string name="network_traffic_autohide">Masquer automatiquement</string>
+  <string name="network_traffic_units_kilobits">Kilobits par seconde (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits par seconde (Mb/s)</string>
+  <string name="network_traffic_show_units">Afficher les unités</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Applications protégées</string>
   <string name="protected_apps_manager_summary">Gérer les applications protégées par un verrou de sécurité</string>
@@ -545,6 +556,11 @@
   <string name="touchscreen_gesture_letter_w_title">Dessiner la lettre « W »</string>
   <string name="touchscreen_gesture_letter_z_title">Dessinez la lettre « Z »</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Glisser vers le haut avec le stylet</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Glisser vers le bas avec le stylet</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Glisser vers la gauche avec le stylet</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Glisser vers la droite avec le stylet</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Appuyer longuement avec le stylet</string>
   <string name="touchscreen_gesture_action_dialog_title">Action lors d\'un geste tactile</string>
   <string name="touchscreen_gesture_action_do_nothing">Ne rien faire</string>
   <string name="touchscreen_gesture_action_flashlight">Activer/Désactiver la lampe de poche</string>
@@ -556,4 +572,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Lecture/pause de la musique</string>
   <string name="touchscreen_gesture_action_previous_track">Retourner à la piste précédente</string>
   <string name="touchscreen_gesture_action_next_track">Passer à la piste suivante</string>
+  <string name="touchscreen_gesture_action_volume_down">Diminuer le volume du média</string>
+  <string name="touchscreen_gesture_action_volume_up">Augmenter le volume du média</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-frp-rIT/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-frp-rIT/plurals.xml b/res/values-frp/plurals.xml
similarity index 100%
copy from res/values-frp-rIT/plurals.xml
copy to res/values-frp/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-frp/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-frp/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-frp/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-gd-rGB/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-gd-rGB/plurals.xml b/res/values-gd/plurals.xml
similarity index 100%
rename from res/values-gd-rGB/plurals.xml
rename to res/values-gd/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-gd/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-gd/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-gd/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-gl-rES/plurals.xml b/res/values-gl/plurals.xml
similarity index 100%
rename from res/values-gl-rES/plurals.xml
rename to res/values-gl/plurals.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 97%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
index 5dd6979..ec27e03 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Axustes de LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Cargando\u2026</string>
   <string name="dlg_ok">ACEPTAR</string>
@@ -38,6 +37,7 @@
   <string name="search">Procurar</string>
   <string name="disabled">Desactivado</string>
   <string name="enabled">Habilitar</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacidade</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lenta</string>
   <string name="pulse_speed_very_slow">Moi lenta</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Luz da batería</string>
   <string name="battery_low_pulse_title">Parpadear se hai pouca batería</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Acción con toque duplo en inicio</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menú de apagado</string>
-  <string name="power_menu_reboot_title">Menú de reinicio</string>
   <string name="power_menu_screenshot_title">Captura de pantalla</string>
   <string name="power_menu_airplane_title">Modo avión</string>
   <string name="power_menu_users_title">Selector de usuario</string>
-  <string name="power_menu_settings_title">Atallos da configuración</string>
-  <string name="power_menu_lockdown_title">Bloqueo de dispositivo</string>
   <string name="power_menu_bug_report_title">Informe de erros</string>
-  <string name="power_menu_sound_title">Panel de sonido</string>
   <string name="power_menu_bug_report_disabled">O informe de erros está desativado nas opcións de desenvolvemento</string>
   <string name="volume_keys_control_ring_stream_title">Control do volume do ton</string>
   <string name="volume_keys_control_ring_stream_summary_on">As teclas de volume controlan o volume do ton de chamada</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Iconas da barra de estado</string>
   <string name="status_bar_icons_summary">Controlar que iconas se amosan na barra de estado</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicacións protexidas</string>
   <string name="protected_apps_manager_summary">Xestiona que aplicacións están protexidas por un bloqueo de seguridade</string>
@@ -545,6 +543,11 @@
   <string name="touchscreen_gesture_letter_w_title">Debuxar a letra \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Debuxar a letra \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Deslice cara arriba có lápiz</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Deslice cara baixo có lápiz</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Deslice á esquerda có lápiz</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Deslice á dereita có lápiz</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Pulsación larga có lápiz</string>
   <string name="touchscreen_gesture_action_dialog_title">Acción do xesto</string>
   <string name="touchscreen_gesture_action_do_nothing">Non facer nada</string>
   <string name="touchscreen_gesture_action_flashlight">Acender/Apagar a linterna</string>
@@ -556,4 +559,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reproducir/pausar reproducción de música</string>
   <string name="touchscreen_gesture_action_previous_track">Desplácese hasta a pista de música anterior</string>
   <string name="touchscreen_gesture_action_next_track">Saltar á seguinte pista de música</string>
+  <string name="touchscreen_gesture_action_volume_down">Baixar o volume dos medios</string>
+  <string name="touchscreen_gesture_action_volume_up">Subir o volume dos medios</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-gu-rIN/plurals.xml b/res/values-gu/plurals.xml
similarity index 100%
rename from res/values-gu-rIN/plurals.xml
rename to res/values-gu/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-gu/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-gu/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-gu/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index da7f71b..26c1765 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS Postavke</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Učitavanje\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Pretraži</string>
   <string name="disabled">Onemogućeno</string>
   <string name="enabled">Omogućeno</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privatnost</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normalan</string>
   <string name="pulse_speed_slow">Sporo</string>
   <string name="pulse_speed_very_slow">Jako sporo</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Baterijsko svjetlo</string>
   <string name="battery_low_pulse_title">Pulsiraj ako je baterija slaba</string>
@@ -209,14 +210,10 @@
   <string name="navigation_bar_home_double_tap_title">Dvostruki dodir</string>
   <!-- Power menu -->
   <string name="power_menu_title">Izbornik napajanja</string>
-  <string name="power_menu_reboot_title">Izbornik Ponovnog pokretanja</string>
   <string name="power_menu_screenshot_title">Snimak zaslona</string>
   <string name="power_menu_airplane_title">Način rada u zrakoplovu</string>
   <string name="power_menu_users_title">Zamjena korisnika</string>
-  <string name="power_menu_settings_title">Postavke prečaca</string>
-  <string name="power_menu_lockdown_title">Zaključavanje uređaja</string>
   <string name="power_menu_bug_report_title">Prijava greške</string>
-  <string name="power_menu_sound_title">Zvučna ploča</string>
   <string name="power_menu_bug_report_disabled">Izvještavanje greški je onemogućeno u razvojnim postavkama</string>
   <string name="volume_keys_control_ring_stream_title">Kontrola glasnoće zvona</string>
   <string name="volume_keys_control_ring_stream_summary_on">Tipke za glasnoću upravljaju glasnoćom zvona</string>
@@ -395,6 +392,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikone trake statusa</string>
   <string name="status_bar_icons_summary">Uredi prikazane ikone trake statusa</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Zaštićene aplikacije</string>
   <string name="protected_apps_manager_summary">Upravljanje aplikacijama koje su skrivene iza sigurnog zaključavanja</string>
@@ -482,4 +480,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4c1a60d..896b2a2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS beállítások</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Betöltés\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Keresés</string>
   <string name="disabled">Letiltva</string>
   <string name="enabled">Engedélyezve</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Adatvédelem</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normál</string>
   <string name="pulse_speed_slow">Lassú</string>
   <string name="pulse_speed_very_slow">Nagyon lassú</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Akkumulátor jelző fény</string>
   <string name="battery_low_pulse_title">Villog, ha merül az akkumulátor</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Kezdőlap dupla érintési művelet</string>
   <!-- Power menu -->
   <string name="power_menu_title">Kikapcsoló menü</string>
-  <string name="power_menu_reboot_title">Újraindítás menü</string>
   <string name="power_menu_screenshot_title">Képernyőmentés</string>
   <string name="power_menu_airplane_title">Repülőgép üzemmód</string>
   <string name="power_menu_users_title">Felhasználóváltás</string>
-  <string name="power_menu_settings_title">Beállítások gyorsgomb</string>
-  <string name="power_menu_lockdown_title">Eszköz lezárása</string>
   <string name="power_menu_bug_report_title">Hibabejelentés</string>
-  <string name="power_menu_sound_title">Hang panel</string>
   <string name="power_menu_bug_report_disabled">Hibajelentés le van tiltva a fejlesztői beállításokban</string>
   <string name="volume_keys_control_ring_stream_title">Csengőhang hangerejének vezérlése</string>
   <string name="volume_keys_control_ring_stream_summary_on">Hangerőgombok a csengőhangot vezérlik</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Állapotsor ikonok</string>
   <string name="status_bar_icons_summary">Állapotsor ikonok megjelenítésének vezérlése</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Védett alkalmazások</string>
   <string name="protected_apps_manager_summary">A biztonsági zár mögötti rejtett alkalmazások kezelése</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Zene lejátszása/szüneteltetése</string>
   <string name="touchscreen_gesture_action_previous_track">Előző zeneszámra ugrás</string>
   <string name="touchscreen_gesture_action_next_track">Következő zeneszámra ugrás</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-hy-rAM/plurals.xml b/res/values-hy/plurals.xml
similarity index 100%
rename from res/values-hy-rAM/plurals.xml
rename to res/values-hy/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-hy/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-hy/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ac14dc7..5991fce 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Pengaturan LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Memuat\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Cari</string>
   <string name="disabled">Dimatikan</string>
   <string name="enabled">Dihidupkan</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privasi</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lambat</string>
   <string name="pulse_speed_very_slow">Sangat lambat</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Lampu baterai</string>
   <string name="battery_low_pulse_title">Berkedip saat baterai lemah</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Tindakan dua kali ketuk home</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menu power</string>
-  <string name="power_menu_reboot_title">Mulai ulang menu</string>
   <string name="power_menu_screenshot_title">Tangkap layar</string>
   <string name="power_menu_airplane_title">Mode pesawat</string>
   <string name="power_menu_users_title">Beralih pengguna</string>
-  <string name="power_menu_settings_title">Setelan pintasan</string>
-  <string name="power_menu_lockdown_title">Perangkat mengunci</string>
   <string name="power_menu_bug_report_title">Lapor bug</string>
-  <string name="power_menu_sound_title">Panel suara</string>
   <string name="power_menu_bug_report_disabled">Pelaporan bug dimatikan dalam opsi pengembang</string>
   <string name="volume_keys_control_ring_stream_title">Kontrol volume nada dering</string>
   <string name="volume_keys_control_ring_stream_summary_on">Tombol volume mengatur volume nada dering</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikon Status bar</string>
   <string name="status_bar_icons_summary">Atur baris Ikon yang ditampilkan</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplikasi dilindungi</string>
   <string name="protected_apps_manager_summary">Kelola aplikasi yang tersembunyi dengan kunci aman</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Putar/jeda pemutaran musik</string>
   <string name="touchscreen_gesture_action_previous_track">Kembali ke trek musik sebelumnya</string>
   <string name="touchscreen_gesture_action_next_track">Lanjut ke trek musik berikutnya</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-is-rIS/plurals.xml b/res/values-is/plurals.xml
similarity index 100%
rename from res/values-is-rIS/plurals.xml
rename to res/values-is/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-is/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-is/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-is/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ee00351..ff533cf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Impostazioni LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Caricamento\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Cerca</string>
   <string name="disabled">Disattivato</string>
   <string name="enabled">Attivato</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacy</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normale</string>
   <string name="pulse_speed_slow">Lento</string>
   <string name="pulse_speed_very_slow">Molto lento</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Indicatore batteria</string>
   <string name="battery_low_pulse_title">Lampeggia con batteria scarica</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Azione doppio tap Home</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menu di accensione</string>
-  <string name="power_menu_reboot_title">Menu riavvio</string>
   <string name="power_menu_screenshot_title">Screenshot</string>
   <string name="power_menu_airplane_title">Modalità aereo</string>
   <string name="power_menu_users_title">Cambio utente</string>
-  <string name="power_menu_settings_title">Scorciatoie impostazioni</string>
-  <string name="power_menu_lockdown_title">Blocco dispositivo</string>
   <string name="power_menu_bug_report_title">Segnalazione bug</string>
-  <string name="power_menu_sound_title">Pannello suoni</string>
   <string name="power_menu_bug_report_disabled">La segnalazione bug è disattivata nelle opzioni sviluppatore</string>
   <string name="volume_keys_control_ring_stream_title">Controllo volume suoneria</string>
   <string name="volume_keys_control_ring_stream_summary_on">I tasti del volume controllano il volume della suoneria</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Icone barra di stato</string>
   <string name="status_bar_icons_summary">Scegli quali icone verranno visualizzate nella barra di stato</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">App protette</string>
   <string name="protected_apps_manager_summary">Gestisci le app protette da un codice di sicurezza</string>
@@ -446,7 +444,7 @@
   <!-- Anonymous Statistics #Lineage -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">Statistiche LineageOS</string>
-  <string name="anonymous_statistics_summary">Aiuta a migliorare Lineage consentendo l\'invio di statistiche anonime</string>
+  <string name="anonymous_statistics_summary">Aiuta a migliorare Cyanogenmod consentendo l\'invio di statistiche anonime</string>
   <string name="anonymous_statistics_warning_title">Info</string>
   <string name="anonymous_statistics_warning">Attivando le Statistiche LineageOS consentirai l\'invio di dati non personali agli sviluppatori per contare il numero di installazioni sui dispositivi. Le informazioni inviate includono un\'identificatore unico che non compromette in alcun modo la tua privacy o dati personali.\n\nPer vedere un esempio di dati inviati, tocca Anteprima Dati.</string>
   <string name="enable_reporting_title">Attiva report</string>
@@ -454,7 +452,7 @@
   <string name="view_stats_title">Vedi statistiche</string>
   <string name="anonymous_learn_more">Ulteriori informazioni</string>
   <!-- Anonymous Statistics - Preview -->
-  <string name="preview_id_title">ID Univico</string>
+  <string name="preview_id_title">ID univoco</string>
   <string name="preview_device_title">Dispositivo</string>
   <string name="preview_version_title">Versione</string>
   <string name="preview_country_title">Paese</string>
@@ -542,6 +540,11 @@
   <string name="touchscreen_gesture_letter_w_title">Disegna la lettera \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Disegna la lettera \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Scorri verso l\'alto con il pennino</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Scorri verso il basso con il pennino</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Scorri verso sinistra con il pennino</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Scorri verso destra con il pennino</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Pressione prolungata con il pennino</string>
   <string name="touchscreen_gesture_action_dialog_title">Azione gesture</string>
   <string name="touchscreen_gesture_action_do_nothing">Non far nulla</string>
   <string name="touchscreen_gesture_action_flashlight">Attiva/Disattiva torcia</string>
@@ -553,4 +556,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Play/Pausa riproduzione musica</string>
   <string name="touchscreen_gesture_action_previous_track">Passa al brano precedente</string>
   <string name="touchscreen_gesture_action_next_track">Passa alla traccia successiva</string>
+  <string name="touchscreen_gesture_action_volume_down">Abbassa volume multimediale</string>
+  <string name="touchscreen_gesture_action_volume_up">Alza volume multimediale</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 7ea6b94..b128528 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">חיפוש</string>
   <string name="disabled">מושבת</string>
   <string name="enabled">מופעל</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">פרטיות</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">רגיל</string>
   <string name="pulse_speed_slow">איטי</string>
   <string name="pulse_speed_very_slow">איטי מאוד</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">רמת בהירות</string>
+  <string name="light_brightness_normal">רגילה</string>
+  <string name="light_brightness_zen">נא לא להפריע</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">נורית הסוללה</string>
   <string name="battery_low_pulse_title">הבהב כאשר הסוללה חלשה</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">קבלת שיחות נכנסות על ידי לחיצה על מקשי עוצמת השמע</string>
   <string name="home_answer_call_title">קבלת שיחה</string>
   <string name="home_answer_call_summary">קבלת שיחות נכנסות על ידי לחיצה על מקש הבית</string>
+  <string name="extras_title">תוספות</string>
+  <string name="additional_buttons_title">מקשים נוספים</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">תאורה אחורית</string>
   <string name="button_backlight_enabled">האר מקשים</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">הצג מקשי ימין ושמאל בעת הכתיבה. במקום מחליף המקלדות.</string>
   <string name="navigation_bar_home_long_press_title">פעולת לחיצה ארוכה על מקש הבית</string>
   <string name="navigation_bar_home_double_tap_title">פעולת לחיצה כפולה על מקש הבית</string>
+  <string name="navigation_bar_app_switch_long_press_title">פעולת לחיצה ארוכה על מקש יישומים אחרונים</string>
   <!-- Power menu -->
   <string name="power_menu_title">תפריט כיבוי</string>
-  <string name="power_menu_reboot_title">תפריט הפעלה מחדש</string>
   <string name="power_menu_screenshot_title">צילום מסך</string>
+  <string name="power_menu_screenshot_summary">לחיצה ארוכה לצילום מסך חלקי</string>
   <string name="power_menu_airplane_title">מצב טיסה</string>
   <string name="power_menu_users_title">מחליף משתמשים</string>
-  <string name="power_menu_settings_title">קיצור דרך להגדרות</string>
-  <string name="power_menu_lockdown_title">נעילת המכשיר</string>
   <string name="power_menu_bug_report_title">דיווח באגים</string>
-  <string name="power_menu_sound_title">לוח עוצמת השמע</string>
   <string name="power_menu_bug_report_disabled">דיווח באגים מושבת בהגדרות מפתח</string>
   <string name="volume_keys_control_ring_stream_title">שליטה בעוצמת הצלצול</string>
   <string name="volume_keys_control_ring_stream_summary_on">מקשי עוצמת השמע שולטים בעוצמת הצלצול</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">סמלי שורת המצב</string>
   <string name="status_bar_icons_summary">בחר את הסמלים שיוצגו בשורת המצב</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">ניטור תעבורת רשת</string>
+  <string name="network_traffic_settings_summary">הצג את מהירות תעבורת הרשת בזמן אמת בשורת המצב</string>
+  <string name="network_traffic_mode_title">מצב תצוגה</string>
+  <string name="network_traffic_mode_disable">כבוי</string>
+  <string name="network_traffic_mode_up">העלאה בלבד</string>
+  <string name="network_traffic_mode_down">הורדה בלבד</string>
+  <string name="network_traffic_mode_all">הורדה והעלאה</string>
+  <string name="network_traffic_autohide">הסתרה אוטומטית</string>
+  <string name="network_traffic_autohide_summary">מנטר תעבורת הרשת יוסתר כאשר אין פעילות</string>
+  <string name="network_traffic_units_title">יחידות מידה לתעבורה</string>
+  <string name="network_traffic_units_kilobits">קילוביט לשנייה (kb/s)</string>
+  <string name="network_traffic_units_megabits">מגהביט לשנייה (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">קילובייט לשנייה (kB/s)</string>
+  <string name="network_traffic_units_megabytes">מגה בייט לשנייה (MB/s)</string>
+  <string name="network_traffic_show_units">הצג יחידות מידה</string>
+  <string name="network_traffic_show_units_summary">מציג את יחידות המידה של התעבורה בשורת המצב</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">יישומים מוגנים</string>
   <string name="protected_apps_manager_summary">נהל אילו יישומים מוסתרים בעזרת נעילה מאובטחת</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">צייר \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">צייר \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">החלק למעלה עם העט</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">החלק למטה עם העט</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">החלק שמאלה עם העט</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">החלק ימינה עם העט</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">לחיצה ארוכה עם העט</string>
   <string name="touchscreen_gesture_action_dialog_title">פעולות מחווה</string>
   <string name="touchscreen_gesture_action_do_nothing">אל תעשה כלום</string>
   <string name="touchscreen_gesture_action_flashlight">הפעל פנס</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">נגן/השהה מדיה</string>
   <string name="touchscreen_gesture_action_previous_track">חזור לשיר הקודם</string>
   <string name="touchscreen_gesture_action_next_track">עבור אל השיר הבא</string>
+  <string name="touchscreen_gesture_action_volume_down">הנמך עוצמת מדיה</string>
+  <string name="touchscreen_gesture_action_volume_up">הגבר עוצמת מדיה</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e280e19..287739d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS の設定</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">読み込み中...</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">検索</string>
   <string name="disabled">無効</string>
   <string name="enabled">有効</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">プライバシー</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">標準</string>
   <string name="pulse_speed_slow">遅い</string>
   <string name="pulse_speed_very_slow">非常に遅い</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">電池のライト</string>
   <string name="battery_low_pulse_title">残量低下時に点滅</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">ホームボタンのダブルタップの動作</string>
   <!-- Power menu -->
   <string name="power_menu_title">電源メニュー</string>
-  <string name="power_menu_reboot_title">再起動メニュー</string>
   <string name="power_menu_screenshot_title">スクリーンショット</string>
   <string name="power_menu_airplane_title">機内モード</string>
   <string name="power_menu_users_title">ユーザーの切り替え</string>
-  <string name="power_menu_settings_title">設定のショートカット</string>
-  <string name="power_menu_lockdown_title">端末をロック</string>
   <string name="power_menu_bug_report_title">バグレポート</string>
-  <string name="power_menu_sound_title">サウンドパネル</string>
   <string name="power_menu_bug_report_disabled">バグレポートは開発者向けオプションで無効になっています</string>
   <string name="volume_keys_control_ring_stream_title">着信音量のコントロール</string>
   <string name="volume_keys_control_ring_stream_summary_on">音量キーで着信音量をコントロールする</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">ステータスバーのアイコン</string>
   <string name="status_bar_icons_summary">ステータスバーに表示するアイコンをコントロールする</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">アプリの保護</string>
   <string name="protected_apps_manager_summary">パスワードでロックしている場合に非表示にするアプリを管理する</string>
@@ -545,6 +543,11 @@
   <string name="touchscreen_gesture_letter_w_title">「W」を描く</string>
   <string name="touchscreen_gesture_letter_z_title">「Z」を描く</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">スタイラスで上にスワイプ</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">スタイラスで下にスワイプ</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">スタイラスで左にスワイプ</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">スタイラスで右にスワイプ</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">スタイラスで長押し</string>
   <string name="touchscreen_gesture_action_dialog_title">ジェスチャーのアクション</string>
   <string name="touchscreen_gesture_action_do_nothing">何もしない</string>
   <string name="touchscreen_gesture_action_flashlight">ライトをトグルする</string>
@@ -556,4 +559,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">音楽の再生/一時停止</string>
   <string name="touchscreen_gesture_action_previous_track">前の楽曲に移動</string>
   <string name="touchscreen_gesture_action_next_track">次の楽曲にスキップ</string>
+  <string name="touchscreen_gesture_action_volume_down">メディア音量を下げる</string>
+  <string name="touchscreen_gesture_action_volume_up">メディア音量を上げる</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ka-rGE/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ka-rGE/plurals.xml b/res/values-ka/plurals.xml
similarity index 100%
rename from res/values-ka-rGE/plurals.xml
rename to res/values-ka/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ka/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ka/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-kab-rDZ/strings.xml b/res/values-kab-rDZ/strings.xml
index 42963d0..e25297f 100644
--- a/res/values-kab-rDZ/strings.xml
+++ b/res/values-kab-rDZ/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,9 +61,10 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #CM -->
+  <!-- Anonymous Statistics #Lineage -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <!-- Anonymous Statistics - Preview -->
   <!-- Display : Rotation  -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-kk-rKZ/plurals.xml b/res/values-kk/plurals.xml
similarity index 100%
rename from res/values-kk-rKZ/plurals.xml
rename to res/values-kk/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-kk/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-kk/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-kk/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-km-rKH/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-km-rKH/plurals.xml b/res/values-km/plurals.xml
similarity index 100%
rename from res/values-km-rKH/plurals.xml
rename to res/values-km/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-km/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-km/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-km/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-kn-rIN/plurals.xml b/res/values-kn/plurals.xml
similarity index 100%
rename from res/values-kn-rIN/plurals.xml
rename to res/values-kn/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-kn/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-kn/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cd95a0e..13723ee 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">검색</string>
   <string name="disabled">사용 안 함</string>
   <string name="enabled">사용</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">프라이버시</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,9 @@
   <string name="pulse_speed_normal">기본</string>
   <string name="pulse_speed_slow">느리게</string>
   <string name="pulse_speed_very_slow">매우 느리게</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">밝기 수준</string>
+  <string name="light_brightness_zen">방해 금지 모드</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">배터리 표시등</string>
   <string name="battery_low_pulse_title">배터리가 적을 때 깜빡임</string>
@@ -194,6 +198,8 @@
   <string name="volume_answer_call_summary">볼륨 버튼을 눌러 걸려온 전화를 받기</string>
   <string name="home_answer_call_title">전화 수신</string>
   <string name="home_answer_call_summary">홈 버튼을 눌러 걸려온 전화를 받기</string>
+  <string name="extras_title">추가 기능</string>
+  <string name="additional_buttons_title">기타 버튼</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">백라이트</string>
   <string name="button_backlight_enabled">버튼 조명 사용</string>
@@ -216,16 +222,14 @@
   <string name="navigation_bar_arrow_keys_summary">입력 시 좌우 커서 버튼을 표시합니다. 입력기 전환기보다 우선합니다.</string>
   <string name="navigation_bar_home_long_press_title">홈 버튼을 길게 누를 시 동작 설정</string>
   <string name="navigation_bar_home_double_tap_title">홈 버튼을 두 번 누를 시 동작 설정</string>
+  <string name="navigation_bar_app_switch_long_press_title">최근 앱 버튼을 길게 누를 때 동작</string>
   <!-- Power menu -->
   <string name="power_menu_title">전원 메뉴</string>
-  <string name="power_menu_reboot_title">다시 시작 메뉴</string>
   <string name="power_menu_screenshot_title">스크린샷</string>
+  <string name="power_menu_screenshot_summary">길게 눌러 부분 스크린샷 촬영</string>
   <string name="power_menu_airplane_title">비행기 모드</string>
   <string name="power_menu_users_title">사용자 전환</string>
-  <string name="power_menu_settings_title">설정 바로 가기</string>
-  <string name="power_menu_lockdown_title">기기 잠금</string>
   <string name="power_menu_bug_report_title">오류 신고</string>
-  <string name="power_menu_sound_title">사운드 패널</string>
   <string name="power_menu_bug_report_disabled">개발자 설정에서 오류 보고가 비활성화되었습니다</string>
   <string name="volume_keys_control_ring_stream_title">벨소리 볼륨 제어</string>
   <string name="volume_keys_control_ring_stream_summary_on">볼륨 키로 벨소리 크기 조절</string>
@@ -429,6 +433,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">상태 표시줄 아이콘</string>
   <string name="status_bar_icons_summary">상태 표시줄에 표시할 아이콘을 설정</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">네트워크 트래픽 모니터</string>
+  <string name="network_traffic_settings_summary">상태 표시줄에 현재 네트워크 트래픽 수준 표시</string>
+  <string name="network_traffic_mode_title">표시 모드</string>
+  <string name="network_traffic_mode_disable">사용 안 함</string>
+  <string name="network_traffic_mode_up">업로드만</string>
+  <string name="network_traffic_mode_down">다운로드만</string>
+  <string name="network_traffic_mode_all">업로드와 다운로드</string>
+  <string name="network_traffic_autohide">자동 숨기기</string>
+  <string name="network_traffic_autohide_summary">아무런 활동이 없을 때 트래픽 모니터 숨기기</string>
+  <string name="network_traffic_units_title">트래픽 측정 단위</string>
+  <string name="network_traffic_units_kilobits">킬로비트/초 (kb/초)</string>
+  <string name="network_traffic_units_megabits">메가비트/초 (Mb/초)</string>
+  <string name="network_traffic_units_kilobytes">킬로바이트/초 (kB/초)</string>
+  <string name="network_traffic_units_megabytes">메가바이트/초 (MB/초)</string>
+  <string name="network_traffic_show_units">단위 표시</string>
+  <string name="network_traffic_show_units_summary">상태 표시줄에 트래픽 측정 단위를 표시할 것인지 설정합니다.</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">보호된 앱</string>
   <string name="protected_apps_manager_summary">보안 잠금 사용 시 숨길 앱 관리</string>
@@ -545,6 +566,11 @@
   <string name="touchscreen_gesture_letter_w_title">문자 \"W\" 그리기</string>
   <string name="touchscreen_gesture_letter_z_title">문자 \"Z\" 그리기</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">스타일러스로 쓸어 올리기</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">스타일러스로 쓸어 내리기</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">스타일러스로 왼쪽으로 밀기</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">스타일러스로 오른쪽으로 밀기</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">스타일러스로 길게 누르기</string>
   <string name="touchscreen_gesture_action_dialog_title">제스처 동작</string>
   <string name="touchscreen_gesture_action_do_nothing">아무것도 하지 않음</string>
   <string name="touchscreen_gesture_action_flashlight">손전등 켜고 끄기</string>
@@ -556,4 +582,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">음악 재생/일시 정지</string>
   <string name="touchscreen_gesture_action_previous_track">이전 음악 트랙으로 이동</string>
   <string name="touchscreen_gesture_action_next_track">다음 음악 트랙으로 이동</string>
+  <string name="touchscreen_gesture_action_volume_down">미디어 음량 작게</string>
+  <string name="touchscreen_gesture_action_volume_up">미디어 음량 크게</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ky-rKG/plurals.xml b/res/values-ky/plurals.xml
similarity index 100%
rename from res/values-ky-rKG/plurals.xml
rename to res/values-ky/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ky/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ky/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-lo-rLA/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-lo-rLA/plurals.xml b/res/values-lo/plurals.xml
similarity index 100%
rename from res/values-lo-rLA/plurals.xml
rename to res/values-lo/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-lo/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-lo/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-mk-rMK/plurals.xml b/res/values-mk/plurals.xml
similarity index 61%
rename from res/values-mk-rMK/plurals.xml
rename to res/values-mk/plurals.xml
index 27ad002..7fc6289 100644
--- a/res/values-mk-rMK/plurals.xml
+++ b/res/values-mk/plurals.xml
@@ -15,4 +15,13 @@
      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>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> секунда</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> секунди</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">еднаш</item>
+    <item quantity="other">%d времиња</item>
+  </plurals>
+</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
new file mode 100644
index 0000000..87835cc
--- /dev/null
+++ b/res/values-mk/strings.xml
@@ -0,0 +1,566 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+	Copyright (C) 2015 The CyanogenMod Project
+	Copyright (C) 2017-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">
+  <!-- Generic stuff used everywhere -->
+  <string name="loading">Вчитување\u2026</string>
+  <string name="dlg_ok">ОК</string>
+  <string name="cancel">Откажи</string>
+  <string name="add">Додај</string>
+  <string name="choose_app">Избери апликација</string>
+  <string name="reset">Ресетирај</string>
+  <string name="advanced">Напредно</string>
+  <string name="settings">Поставки</string>
+  <string name="name">Име</string>
+  <string name="back">Назад</string>
+  <string name="finish">Завршо</string>
+  <string name="next">Следно</string>
+  <string name="on">Уклучено</string>
+  <string name="off">Исклучено</string>
+  <string name="yes">Да</string>
+  <string name="no">Не</string>
+  <string name="search">Пребарај</string>
+  <string name="disabled">Оневозможено</string>
+  <string name="enabled">Овозможено</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
+  <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_title">Приватност</string>
+  <!-- Privacy Guard -->
+  <string name="privacy_guard_switch_label">Овозможи заштита на приватноста</string>
+  <string name="privacy_guard_dlg_title">Овозможи заштита на приватност?</string>
+  <string name="privacy_guard_dlg_text">Кога заштитата на приватноста е овозможена, апликацијата нема да може да пристапи до лични податоци, како што се контакти, пораки или дневници за повици.</string>
+  <string name="privacy_guard_dlg_system_app_text">Кога ќе овозможите заштита на приватноста за вградена апликација, апликацијата нема да може да пристапи или да обезбеди лични податоци. Ова може да предизвика други апликации да се однесуваат неправедно.</string>
+  <string name="privacy_guard_default_title">Овозможено по стандард</string>
+  <string name="privacy_guard_manager_summary">Управување со апликации кои имаат пристап до вашите лични податоци</string>
+  <string name="privacy_guard_no_user_apps">Нема инсталирани апликации</string>
+  <string name="privacy_guard_help_title">Помош</string>
+  <string name="privacy_guard_reset_title">Ресетирај</string>
+  <string name="privacy_guard_reset_text">Ресетирај ги дозволите?</string>
+  <string name="privacy_guard_help_text">Во овој екран можете да одберете кои апликации за заштита на приватноста треба да бидат активни со едноставно притискање. Избраните апликации нема да можат да пристапат до вашите лични податоци, како што се контакти, пораки или дневници за повици. Долго притискање на записот на апликацијата го отвора екранот со деталите за апликацијата.\n\nВградените апликации не се прикажани стандардно, но можат да бидат откриени со избирање на соодветната опција на менито.</string>
+  <string name="privacy_guard_manager_show_system_apps">Прикажи вградени апликации</string>
+  <string name="privacy_guard_advanced_settings_title">Напредно</string>
+  <string name="privacy_guard_notification_title">Прикажи известување</string>
+  <!-- Notification light dialogs -->
+  <string name="edit_light_settings">Уреди ги поставките за светло</string>
+  <string name="pulse_speed_title">Должина на пулсирање и брзина</string>
+  <string name="default_time">Нормално</string>
+  <string name="custom_time">Рачно</string>
+  <string name="dialog_delete_title">Избриши</string>
+  <string name="dialog_delete_message">Отстрани ги избраните ставки?</string>
+  <string name="brightness">Ниво на осветлување</string>
+  <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">Секогаш уклучено</string>
+  <string name="pulse_length_very_short">Многу кратко</string>
+  <string name="pulse_length_short">Кратко</string>
+  <string name="pulse_length_normal">Нормално</string>
+  <string name="pulse_length_long">Долго</string>
+  <string name="pulse_length_very_long">Многу долго</string>
+  <string name="pulse_speed_very_fast">Многу брзо</string>
+  <string name="pulse_speed_fast">Брзо</string>
+  <string name="pulse_speed_normal">Нормално</string>
+  <string name="pulse_speed_slow">Бавно</string>
+  <string name="pulse_speed_very_slow">Многу бавно</string>
+  <!-- Common light settings strings -->
+  <!-- Battery light settings -->
+  <string name="battery_light_title">Светло на батеријата</string>
+  <string name="battery_low_pulse_title">Пулсирај ако батеријата е празна</string>
+  <string name="battery_light_list_title">Бои</string>
+  <string name="battery_light_low_color_title">Празна батерија</string>
+  <string name="battery_light_medium_color_title">Полнење</string>
+  <string name="battery_light_full_color_title">Целосно наполнета</string>
+  <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">Светло за известување</string>
+  <string name="notification_light_general_title">Општо</string>
+  <string name="notification_light_advanced_title">Напредно</string>
+  <string name="notification_light_applist_title">Апликации</string>
+  <string name="notification_light_phonelist_title">Телефон</string>
+  <string name="notification_light_use_custom">Користете сопствени вредности</string>
+  <string name="notification_light_default_value">Стандардно</string>
+  <string name="notification_light_missed_call_title">Пропуштен повик</string>
+  <string name="notification_light_voicemail_title">Говорна пошта</string>
+  <string name="notification_light_screen_on">Светла со пуштен екран</string>
+  <string name="notification_light_zen_mode">Светла во режимот Не вознемирувај</string>
+  <string name="keywords_lights_brightness_level">затемнување на LED светлата за осветлување</string>
+  <string name="notification_light_automagic">Изберете бои автоматски</string>
+  <string name="notification_light_automagic_summary">Одбирање бои автоматски</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Поставки за светла</string>
+  <string name="led_notification_text">LED светло овозможено од поставките</string>
+  <string name="notification_light_no_apps_summary">За да додадете контрола на апликацијата, активирајте %1$s и притиснете \u002b на менито</string>
+  <!-- LiveDisplay -->
+  <string name="live_display_summary">Оптимизирајте го вашиот екран врз основа на време од денот и амбиентални услови за да се подобри читливоста и да се намали обемот на очите</string>
+  <string name="live_display_mode">Режим на екранот</string>
+  <string name="live_display_color_temperature_title">Температура на бојата</string>
+  <string name="live_display_color_temperature_summary">Ден <xliff:g id="day_temperature">%1$d</xliff:g>K  Ноќ: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">Ден</string>
+  <string name="live_display_night">Ноќ</string>
+  <string name="live_display_outdoor_mode_title">Автоматски режим на отворено</string>
+  <string name="live_display_outdoor_mode_summary">Зголемете ја осветленоста и сатурацијата автоматски под силна сончева светлина</string>
+  <string name="live_display_low_power_title">Намали ја потрошувачката енергија</string>
+  <string name="live_display_low_power_summary">Прилагодете го екранот за најниска потрошувачка на енергија без деградација</string>
+  <string name="live_display_enhance_color_title">Подобрете ги боите</string>
+  <string name="live_display_enhance_color_summary">Подобрете ја динамиката на боите од тонови на месо, сцени и други слики</string>
+  <string name="live_display_color_profile_title">Профил на боја</string>
+  <string name="live_display_color_profile_standard_title">Стандардно</string>
+  <string name="live_display_color_profile_standard_summary">Точни бои и светли бели</string>
+  <string name="live_display_color_profile_natural_title">Природно</string>
+  <string name="live_display_color_profile_natural_summary">Реални бои и тонови на месо</string>
+  <string name="live_display_color_profile_dynamic_title">Динамично</string>
+  <string name="live_display_color_profile_dynamic_summary">Подобрени бои и светли бели</string>
+  <string name="live_display_color_profile_cinema_title">Кино</string>
+  <string name="live_display_color_profile_cinema_summary">Совршена репродукција на боите за видео</string>
+  <string name="live_display_color_profile_astronomy_title">Астрономија</string>
+  <string name="live_display_color_profile_astronomy_summary">Длабоко црвена за зачувување на ноќниот вид</string>
+  <string name="live_display_color_profile_photography_title">Фотографија</string>
+  <string name="live_display_color_profile_photography_summary">Совршена репродукција на боите за фотографии</string>
+  <string name="live_display_color_profile_basic_title">Основно</string>
+  <string name="live_display_color_profile_basic_summary">Користете го екранот некалибриран</string>
+  <string name="live_display_color_profile_adaptive_title">Адаптивно</string>
+  <string name="live_display_color_profile_adaptive_summary">Боите се прилагодуваат на амбиентални услови</string>
+  <string name="live_display_color_profile_reading_title">Читање</string>
+  <string name="live_display_color_profile_reading_summary">Потемни бои за помалку замор на очите</string>
+  <string name="live_display_color_profile_srgb_title">sRGB</string>
+  <string name="live_display_color_profile_srgb_summary">Бои прецизни во просторот за боја на sRGB</string>
+  <string name="live_display_color_profile_dci_p3_title">DCI-P3</string>
+  <string name="live_display_color_profile_dci_p3_summary">Боиите се точни за просторот за боја DCI-P3</string>
+  <string name="color_calibration_title">Калибрација на боја</string>
+  <string name="color_calibration_summary">Калибрирај ги боите на екранот</string>
+  <string name="color_red_title">Црвено</string>
+  <string name="color_green_title">Зелено</string>
+  <string name="color_blue_title">Сино</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Прилагодување на сликата</string>
+  <string name="picture_adjustment_summary">Прилагодете боја, сатурација, интензитет и контраст</string>
+  <string name="adj_hue_title">Нијанса</string>
+  <string name="adj_saturation_title">Сатурација</string>
+  <string name="adj_intensity_title">Интензитет</string>
+  <string name="adj_contrast_title">Контраст</string>
+  <!-- Button settings -->
+  <string name="button_pref_title">Копчиња</string>
+  <string name="hardware_keys_power_key_title">Копче за напојување</string>
+  <string name="hardware_keys_home_key_title">Копче за почеток</string>
+  <string name="hardware_keys_back_key_title">Копче за назад</string>
+  <string name="hardware_keys_menu_key_title">Копче за мени</string>
+  <string name="hardware_keys_assist_key_title">Копче за пребарување</string>
+  <string name="hardware_keys_appswitch_key_title">Копче за неодамнешни</string>
+  <string name="hardware_keys_camera_key_title">Копче за камера</string>
+  <string name="hardware_keys_volume_keys_title">Копчиња за глас</string>
+  <string name="hardware_keys_short_press_title">Кратко притискање</string>
+  <string name="hardware_keys_long_press_title">Акција за долго притискање</string>
+  <string name="hardware_keys_double_tap_title">Акција за двојно притискање</string>
+  <string name="hardware_keys_action_nothing">Без акција</string>
+  <string name="hardware_keys_action_menu">Овори/затвори мени</string>
+  <string name="hardware_keys_action_app_switch">Приказ на неодамнешни апликации</string>
+  <string name="hardware_keys_action_search">Помошник за пребарување</string>
+  <string name="hardware_keys_action_voice_search">Гласовно пребарување</string>
+  <string name="hardware_keys_action_in_app_search">Пребарување во апликација</string>
+  <string name="hardware_keys_action_launch_camera">Стартувај камера</string>
+  <string name="hardware_keys_action_sleep">Исклучи го екранот</string>
+  <string name="hardware_keys_action_last_app">Последна апликација</string>
+  <string name="hardware_keys_action_split_screen">Поделен екран</string>
+  <string name="hardware_keys_action_single_handed_left">Режим на работа со една рака (лева)</string>
+  <string name="hardware_keys_action_single_handed_right">Режим на работа со една рака (десна)</string>
+  <string name="camera_sleep_on_release_title">Ѕиркање на екранот</string>
+  <string name="camera_sleep_on_release_summary">Половина притискање ќе го задржи екранот уклучен само додека копчето се држи надолу</string>
+  <string name="camera_launch_title">Стартувај камера</string>
+  <string name="camera_launch_summary">Долго притискање и пуштање ќе ја стартува камерата</string>
+  <string name="volbtn_music_controls_title">Контролирње на репродукцијата</string>
+  <string name="volbtn_music_controls_summary">Прескокнете песни со долго притискање на копчињата за јачина на звукот додека екранот е исклучен</string>
+  <string name="volbtn_cursor_control_title">Контрола на курсорот на тастатурата</string>
+  <string name="volbtn_cursor_control_off">Оневозможено</string>
+  <string name="volbtn_cursor_control_on">Јачината на звукот горе/долу го поместува курсорот лево/десно</string>
+  <string name="volbtn_cursor_control_on_reverse">Јачината на звукот горе/долу го поместува курсорот десно/лево</string>
+  <string name="power_end_call_title">Заврши го повикот</string>
+  <string name="power_end_call_summary">Завршете го тековниот повик со притискање на копчето за вклучување</string>
+  <string name="swap_volume_buttons_title">Преориентација</string>
+  <string name="swap_volume_buttons_summary">Заменете ги местата на копчиња за менување на јачината на звукот кога екранот е ротиран</string>
+  <string name="button_wake_title">Разбуди уред</string>
+  <string name="volume_answer_call_title">Одговори на повикот</string>
+  <string name="volume_answer_call_summary">Одговори на дојдовните повици со притискање на копчињата за јачина на звук</string>
+  <string name="home_answer_call_title">Одговори на повикот</string>
+  <string name="home_answer_call_summary">Одговори на дојдовните повици со притискање на домашното копче</string>
+  <!-- Key backlight -->
+  <string name="button_backlight_title">Позадинско осветлување</string>
+  <string name="button_backlight_enabled">Осветлете ги копчињата</string>
+  <string name="keyboard_backlight_enabled">Осветлете ја тастатурата</string>
+  <string name="button_backlight_seekbar_title">Светлост на копчињата</string>
+  <string name="keyboard_backlight_seekbar_title">Светлост на тастатурата</string>
+  <string name="backlight_timeout_title">Истек на светлоста</string>
+  <string name="backlight_timeout_unlimited">Не исклучувај</string>
+  <string name="backlight_summary_disabled">Оневозможено</string>
+  <string name="backlight_summary_enabled_with_timeout">Овозможено за <xliff:g id="timeout">%s</xliff:g></string>
+  <string name="backlight_summary_enabled">Овозможено</string>
+  <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">Овозможи лента за навигација на екранот</string>
+  <string name="disable_navkeys_summary">Овозможи лента за навигација на екранот и оневозможете ги хардверските копчиња</string>
+  <!-- Navigation Bar -->
+  <string name="navigation_bar_category">Навигациска лента</string>
+  <string name="navigation_bar_title">Копчиња и распоред</string>
+  <string name="navigation_bar_left_summary">Ставете ја лентата за навигација на левата страна на екранот во режим на пејзаж</string>
+  <string name="navigation_bar_arrow_keys_title">Прикажи ги копчињата со стрелки додека пишувате</string>
+  <string name="navigation_bar_arrow_keys_summary">Приказ на лево и десно курсорски копчиња додека пишувате. Преклопува преклопник за IME.</string>
+  <string name="navigation_bar_home_long_press_title">Акција за долго притискање на домашно копче</string>
+  <string name="navigation_bar_home_double_tap_title">Акција за двојно притискање на домашно копче</string>
+  <!-- Power menu -->
+  <string name="power_menu_title">Мени за напојување</string>
+  <string name="power_menu_screenshot_title">Слика од екранот</string>
+  <string name="power_menu_airplane_title">Авионски режим</string>
+  <string name="power_menu_users_title">Замена на корисник</string>
+  <string name="power_menu_bug_report_title">Пријава на грешка</string>
+  <string name="power_menu_bug_report_disabled">Пријавување на грешки е оневозможено во развојните поставки</string>
+  <string name="volume_keys_control_ring_stream_title">Контрола на јачината на ѕвонење</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Копчињата за јачина на звук ја контролираат јачината на ѕвонењето</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Копчињата за јачина на звук го контролираат звукот на медија</string>
+  <string name="camera_double_tap_power_gesture_title">Притиснете го копчето за напојување двапати за да ја уклучите камерата</string>
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <string name="camera_double_tap_power_gesture_desc">Брзо отворање на камерата без да го отклучите вашиот екран</string>
+  <string name="torch_long_press_power_gesture_title">Долг притисок за светилка</string>
+  <string name="torch_long_press_power_gesture_desc">Активирајте ја светилката со долго притискање на копчето за напојување додека екранот е исклучен</string>
+  <string name="torch_long_press_power_timeout_title">Автоматски исклучи ја светилката</string>
+  <string name="torch_long_press_power_timeout_never">Никогаш</string>
+  <string name="torch_long_press_power_timeout_1min">1 минута</string>
+  <string name="torch_long_press_power_timeout_2min">2 минути</string>
+  <string name="torch_long_press_power_timeout_5min">5 минути</string>
+  <string name="torch_long_press_power_timeout_10min">10 минути</string>
+  <!-- Profiles -->
+  <string name="profile_menu_delete_title">Избриши</string>
+  <string name="profile_action_none">Остави непроменето</string>
+  <string name="profile_action_system">Стандарден систем</string>
+  <string name="profile_action_disable">Исклучи</string>
+  <string name="profile_action_enable">Уклучи</string>
+  <string name="profile_trigger_a2dp_connect">На A2DP поврзување</string>
+  <string name="profile_trigger_a2dp_disconnect">На A2DP исклучување</string>
+  <string name="profile_tabs_wifi">Wi\u2011Fi</string>
+  <string name="profile_tabs_bluetooth">Bluetooth</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">Предизвикувачи кои ќе го активираат овој профил</string>
+  <string name="profile_setup_setup_triggers_title">Чекор 1: Додај предизвикувачи</string>
+  <string name="profile_setup_setup_triggers_title_config">Измена на предизвикувачи: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">Чекор 2: Постави акции</string>
+  <string name="profile_setup_actions_title_config">Реконфигурирај ги акциите</string>
+  <string name="wireless_networks_settings_title">Безжична врска и мрежи</string>
+  <!-- Profile triggers -->
+  <string name="no_bluetooth_triggers">Нема спарени уреди со Bluetooth.\nДопрете за да го спарите Bluetooth уредот пред да конфигурирате предизвикувачи.</string>
+  <string name="no_wifi_triggers">Нема конфигурирани пристапни точки за Wi\u2011Fi.\nДопрете за поврзување на Wi\u2011Fi пред да ги конфигурирате предизвикувачите.</string>
+  <string name="no_triggers_configured">Нема конфигурирани предизвикувачи. Допрете за да додадете повеќе.</string>
+  <string name="no_triggers_configured_nfc">Допрете за да поставите нов NFC предизвикувач.</string>
+  <string name="profile_setup_setup_triggers_description">Изберете предизвикувачи кои ќе го активираат овој профил</string>
+  <string name="profile_setup_actions_description">Сега конфигурирај што се случува кога профилот е активиран</string>
+  <!-- Profiles settings  -->
+  <string name="profiles_settings_title">Системски профили</string>
+  <string name="profiles_add">Додај</string>
+  <string name="profile_menu_delete">Избриши</string>
+  <string name="profile_settings_title">Профил</string>
+  <string name="profile_empty_list_profiles_off">За да ги конфигурирате и користите системските профили, вклучете ги профилите.</string>
+  <string name="profile_settings_summary_off">Профилите се оневозможени</string>
+  <string name="profile_trigger_configure">Конфигурирај го предизвикувачот</string>
+  <string name="profile_write_nfc_tag">Напишете ја ознаката NFC</string>
+  <string name="profile_write_touch_tag">Допрете ја ознаката за пишување</string>
+  <string name="profile_write_success">Ознаката е успешно напишана</string>
+  <string name="profile_write_failed">Пишувањето на ознака не успеа!</string>
+  <string name="profile_selected">Избран профил:%1$s</string>
+  <string name="profile_nfc_text">Пишување на профил до ознака NFC овозможува допирање на ознаката за да го изберете профилот. Притиснувајќи по втор пат, ќе го изберете претходно избраниот профил.</string>
+  <string name="profile_unknown_nfc_tag">Непознат профил</string>
+  <string name="profile_add_nfc_text">Оваа ознака за NFC се однесува на непознат профил. Прицврстувањето на оваа ознака за NFC на постоечки профил ќе овозможи избор на профилот во иднина.</string>
+  <string name="profile_select">Изберете профил</string>
+  <string name="profile_remove_dialog_message">Отстрани го профилот %1$s?</string>
+  <string name="profile_populate_profile_from_state">Конфигурирајте профил користејќи ги тековните поставки за уредот?</string>
+  <string name="profile_menu_fill_from_state">Увези ги тековните поставки за уредот</string>
+  <string name="profile_remove_current_profile">Не можам да го избришам тековниот профил!</string>
+  <string name="profile_app_group_category_title">Известувањето се преклопува</string>
+  <string name="profile_app_group_item_instructions">Додај или отстрани групи</string>
+  <string name="profile_app_group_item_instructions_summary">Додај или отстрани апликација за превземање на известување за овој профил</string>
+  <!-- Profile mode options. -->
+  <string name="profile_entries_on">Уклучен</string>
+  <string name="profile_entries_off">Исклучен</string>
+  <string name="profile_entries_no_override">Без замена</string>
+  <!-- Add Profile -->
+  <string name="profile_name_title">Име</string>
+  <string name="new_profile_name">&lt;нов профил&gt;</string>
+  <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">Реименувај</string>
+  <string name="rename_dialog_message">Внесете ново име</string>
+  <string name="rename_dialog_hint">Внесете име на профил</string>
+  <!-- Reset Profiles -->
+  <string name="profile_reset_title">Ресетирај</string>
+  <string name="profile_reset_message">Избришете ги сите кориснички профили и групи на корисници и вратете ги на стандардно?</string>
+  <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">Отстрани ја оваа апликација?</string>
+  <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
+  <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">Јачината на гласноста се преклопува</string>
+  <string name="connection_state_enabled">Овозможи</string>
+  <string name="volume_override_summary">Постави на %1$s/%2$s</string>
+  <string name="profile_volume_override_checkbox_label">Замени ја јачината на звукот</string>
+  <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">Профили</string>
+  <string name="profile_profile_manage">Управувај со профилот</string>
+  <string name="profile_appgroups_manage">Групи на апликации</string>
+  <string name="profile_appgroup_manage">Управувајте со групата на апликации</string>
+  <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">Прилагодувања на профилот</string>
+  <string name="profile_trigger_connect">При поврзување</string>
+  <string name="profile_trigger_disconnect">При исклучување</string>
+  <string name="profile_trigger_notrigger">Нема окидач</string>
+  <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">Режим на известување</string>
+  <string name="ringer_mode">Режим на ѕвонење</string>
+  <string name="lights_mode">Режим на осветлување</string>
+  <string name="vibrate_mode">Режим на вибрирање</string>
+  <string name="choose_soundtone">Изберете тон за известување</string>
+  <string name="choose_ringtone">Изберете мелодија</string>
+  <string name="ringtone_title">Телефонска мелодија</string>
+  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">Мелодија за известување</string>
+  <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Апликациски групи</string>
+  <string name="profile_applist_title">Апликации</string>
+  <string name="profile_new_appgroup">Нова група на апликација</string>
+  <string name="profile_delete_appgroup">Избришете ја оваа група на апликација?</string>
+  <string name="profile_appgroup_name_prompt">Внесете име за новата група на апликација</string>
+  <string name="profile_appgroup_name_title">Име</string>
+  <string name="duplicate_appgroup_name">Дуплирај го името на групата на апликации!</string>
+  <!-- Add application dialog box title -->
+  <string name="profile_choose_app">Избери апликација</string>
+  <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">Системски поставки</string>
+  <string name="profile_lockmode_title">Режим на заклучен екран</string>
+  <string name="profile_lockmode_policy_disabled_summary">Оваа опција за профилот е оневозможена од администраторската политика на уредот</string>
+  <string name="profile_lockmode_insecure_summary">Не прашувај за PIN или лозинка</string>
+  <string name="profile_lockmode_disabled_summary">Оневозможи заклучување на екранот</string>
+  <string name="profile_airplanemode_title">Авионски режим</string>
+  <string name="profile_brightness_title">Осветленост на екранот</string>
+  <string name="profile_brightness_override_summary">Постави на %1$d%%</string>
+  <string name="profile_brightness_override_checkbox_label">Замени ја осветленоста</string>
+  <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi\u2011Fi</string>
+  <string name="toggleWifiAp">Пренослив Wi\u2011Fi hotspot</string>
+  <string name="toggleBluetooth">Bluetooth</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">Мобилни податоци</string>
+  <string name="toggleSync">Авто-синхронизација на податоци</string>
+  <string name="toggle2g3g4g">Префериран тип на мрежа</string>
+  <string name="toggle2g3g4g_msim">Префериран тип на мрежа (%1$s)</string>
+  <string name="toggleNfc">NFC</string>
+  <!-- Sound settings screen -->
+  <string name="ring_mode_title">Режим на ѕвонење</string>
+  <string name="ring_mode_normal">Нормален</string>
+  <string name="ring_mode_vibrate">Вибрирај</string>
+  <string name="ring_mode_mute">Мутирај</string>
+  <string name="ring_volume_title">Јачина на ѕвонење</string>
+  <string name="incoming_call_volume_title">Мелодија</string>
+  <string name="notification_volume_title">Известување</string>
+  <string name="media_volume_title">Медиа</string>
+  <string name="alarm_volume_title">Аларм</string>
+  <string name="doze_title">Амбиентален екран</string>
+  <!-- Status bar -->
+  <string name="status_bar_title">Статусна лента</string>
+  <string name="status_bar_quick_qs_pulldown_title">Брз пристап</string>
+  <string name="status_bar_quick_qs_pulldown_summary">%1$s работ на статусната лента се повлекува по брзи поставувања</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Лево</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Десно</string>
+  <string name="status_bar_quick_qs_pulldown_off">Исклучен</string>
+  <string name="status_bar_quick_qs_pulldown_left">Леви</string>
+  <string name="status_bar_quick_qs_pulldown_right">Десни</string>
+  <string name="status_bar_double_tap_to_sleep_title">Двоен допир за спиење</string>
+  <string name="status_bar_double_tap_to_sleep_summary">Двоен-допир на статусната лента за да го исклучите екранот</string>
+  <!-- Status bar - icons -->
+  <string name="status_bar_icons_title">Икони на статусната лента</string>
+  <string name="status_bar_notif_count_title">Прикажи го бројот на известувања</string>
+  <string name="status_bar_notif_count_summary">Прикажи го бројот на очекуваните известувања</string>
+  <string name="status_bar_system_icons_title">Системски икони</string>
+  <string name="status_bar_system_icons_summary">Контролирај кои икони на статусната лента се прикажани</string>
+  <!-- Status bar - Clock -->
+  <string name="status_bar_clock_title">Часовник</string>
+  <string name="status_bar_clock_position_title">Позиција на часовникот</string>
+  <string name="status_bar_clock_position_right">Десно</string>
+  <string name="status_bar_clock_position_left">Лево</string>
+  <string name="status_bar_clock_position_center">Средина</string>
+  <string name="status_bar_am_pm_title">AM / PM стил</string>
+  <string name="status_bar_am_pm_info">24-часовен формат е овозможен</string>
+  <string name="status_bar_am_pm_normal">Нормален</string>
+  <string name="status_bar_am_pm_small">Мал</string>
+  <string name="status_bar_am_pm_hidden">Скриено</string>
+  <!-- Status bar - Battery -->
+  <string name="status_bar_battery_title">Индикатор за батерија</string>
+  <string name="status_bar_battery_style_title">Стил на индикатор на батеријата</string>
+  <string name="status_bar_battery_style_icon_portrait">Иконски портрет</string>
+  <string name="status_bar_battery_style_icon_landscape">Иконски пејзаж</string>
+  <string name="status_bar_battery_style_circle">Круг</string>
+  <string name="status_bar_battery_style_text">Текст</string>
+  <string name="status_bar_battery_style_hidden">Скриено</string>
+  <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">Процент на батерија</string>
+  <string name="status_bar_battery_percentage_default">Скриено</string>
+  <string name="status_bar_battery_percentage_text_inside">Внатре во иконата</string>
+  <string name="status_bar_battery_percentage_text_next">До иконата</string>
+  <!-- Status bar - Brightness -->
+  <string name="status_bar_brightness_category">Осветленост</string>
+  <string name="status_bar_brightness_slider_title">Лизгач за осветленост</string>
+  <string name="status_bar_brightness_slider_summary">Прилагодете ја осветленоста од брзите поставки</string>
+  <string name="status_bar_brightness_slider_auto_title">Автоматска осветленост</string>
+  <string name="status_bar_brightness_slider_auto_summary">Покажи го менувачот за адаптивна осветленост во близина на лизгачот</string>
+  <string name="status_bar_toggle_brightness">Контрола на осветленост</string>
+  <string name="status_bar_toggle_brightness_summary">Прилагодете ја осветленоста со лизгање низ статусната лента</string>
+  <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Икони на статусната лента</string>
+  <string name="status_bar_icons_summary">Контролирајте кои икони на статусната лента се прикажани</string>
+  <!-- Status bar - Network Traffic -->
+  <!-- Protected apps -->
+  <string name="protected_apps_manager_title">Заштитени апликации</string>
+  <string name="protected_apps_manager_summary">Управувајте со апликации кои се скриени зад безбедно заклучување</string>
+  <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">Соработници</string>
+  <string name="contributors_cloud_loading_message">Вчитување на податоците за соработниците\u2026</string>
+  <string name="contributors_cloud_failed_message">Не може да се вчитаат податоците за соработниците</string>
+  <string name="contributor_info_menu">Информации за соработникот</string>
+  <string name="contributor_info_msg">
+<![CDATA[<b>Име:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Прекар:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Придонес:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">Информации за придонеси</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>Вкупно соработници:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Вкупно придонеси:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Последно ажурирање:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <!-- Anonymous Statistics #Lineage -->
+  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS статистика</string>
+  <string name="anonymous_statistics_summary">Помогнете за подобрувањето на LineageOS со одбирање на анонимно известување за статистика</string>
+  <string name="anonymous_statistics_warning_title">За</string>
+  <string name="anonymous_statistics_warning">Откажувањето во LineageOS статистика ќе им овозможи на не-лични податоци да бидат доставени до програмерите на LineageOS за да ги следат уникатните инсталации низ уредите. Доставените информации вклучуваат уникатен идентификатор, што не ја загрозува вашата приватност или лични податоци. Податоците се поднесуваат за време на секое подигање.\n\nЗа пример на податоците што се доставуваат, допрете на преглед на податоци.</string>
+  <string name="enable_reporting_title">Овозможи извештај</string>
+  <string name="preview_data_title">Преглед на податоци</string>
+  <string name="view_stats_title">Прикажи ги статистиките</string>
+  <string name="anonymous_learn_more">Научи повеќе</string>
+  <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">Уникатен ID</string>
+  <string name="preview_device_title">Уред</string>
+  <string name="preview_version_title">Верзија</string>
+  <string name="preview_country_title">Држава</string>
+  <string name="preview_carrier_title">Оператор</string>
+  <string name="stats_collection_title">Собирање статистика</string>
+  <string name="stats_collection_summary">Дозволи да се соберат метрите за инсталација и статистика на уредот</string>
+  <!-- Display : Rotation  -->
+  <string name="accelerometer_title">Автоматско ротирање на екранот</string>
+  <string name="display_rotation_title">Поставувања за ротација</string>
+  <string name="display_rotation_enabled">Автоматската ротација е овозможена</string>
+  <string name="display_rotation_disabled">Автоматската ротација е оневозможена</string>
+  <string name="display_rotation_unit">степени</string>
+  <string name="display_lockscreen_rotation_title">Ротирај го екранот за заклучување</string>
+  <string name="display_rotation_category_title">Режими на ротација</string>
+  <string name="display_rotation_0_title">0 степени</string>
+  <string name="display_rotation_90_title">90 степени</string>
+  <string name="display_rotation_180_title">180 степени</string>
+  <string name="display_rotation_270_title">270 степени</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Време</string>
+  <string name="weather_settings_no_services_prompt">Не се инсталирани услуги за временски прогнози</string>
+  <string name="weather_settings_no_services_summary">Инсталирајте временски провајдер за да добивате ажурирања на временските прогнози</string>
+  <string name="weather_settings_button">Поставувања на провајдерот</string>
+  <string name="weather_settings_activity_not_found">Не може да се подигне менито за поставувања на овој провајдер</string>
+  <string name="weather_settings_add_weather_provider">Додај временски провајдер</string>
+  <string name="weather_settings_general_settings_title">Општо</string>
+  <string name="weather_settings_providers_title">Провајдери</string>
+  <string name="weather_settings_temp_units_title">Единица за температура</string>
+  <string name="weather_settings_temp_celsius">Целзиус</string>
+  <string name="weather_settings_temp_fahrenheit">Фаренхајт</string>
+  <string name="weather_settings_keyword">време</string>
+  <string name="status_bar_show_weather_title">Покажи го времето</string>
+  <string name="status_bar_show_weather_summary">Прикажете ја моменталната температура на статусната лента</string>
+  <!-- Power: Performance profiles -->
+  <string name="perf_profile_settings_title">Заштедувач на батерија и перформанси</string>
+  <string name="perf_profile_settings_summary">Прилагодете ги функциите за заштеда на енергија и ефикасноста на уредот</string>
+  <string name="perf_profile_overview_summary">Тековен профил: <xliff:g id="perf_profile_name">%1$s</xliff:g></string>
+  <string name="perf_profile_category_title">Перформанси на уредот</string>
+  <string name="perf_profile_title">Профил за перформанси: <xliff:g id="perf_profile_name">%1$s</xliff:g></string>
+  <string name="perf_profile_fail_toast">Профилот за перформанси во моментов не е достапен</string>
+  <string name="power_save_category_title">Заштеда на батерија</string>
+  <string name="power_save_title">Екстремно штедење на енергија</string>
+  <string name="power_save_summary">Ограничете ги перформансите на уредот и активноста во позадина за да заштедите енергија</string>
+  <string name="auto_power_save_title">Автоматско штедење на енергија</string>
+  <string name="auto_power_save_summary_on">Автоматски вклучи режим за штедење на енергија на %s на батеријата</string>
+  <string name="auto_power_save_summary_off">Не овозможувај автоматски режим за штедење</string>
+  <string name="auto_power_save_never">Никогаш</string>
+  <!-- Applications: Expanded desktop -->
+  <string name="expanded_desktop_settings_title">Проширена работна површина</string>
+  <string name="expanded_desktop_settings_summary">Проширете го вашиот достапен работен простор со криење на лентата за статус, лента за навигација или и двете</string>
+  <string name="expanded_desktop_options_title">Опции за прилагодување</string>
+  <string name="expanded_desktop_style_title">Стил на проширен работен простор</string>
+  <string name="expanded_desktop_style_hide_nothing">Не сокривај ништо</string>
+  <string name="expanded_desktop_style_hide_status">Сокриј ја лентата за статус</string>
+  <string name="expanded_desktop_style_hide_navigation">Сокриј ја лентата за навигација</string>
+  <string name="expanded_desktop_style_hide_both">Сокриј ги двете</string>
+  <string name="expanded_desktop_nothing_to_show_text">Исклучете го прекинувачот за да ја прилагодите проширената работна површина за секоја апликација</string>
+  <!-- Sounds: Charging sounds -->
+  <string name="charging_sounds_settings_title">Звуци за полнење</string>
+  <string name="charging_sounds_enabled_title">Овозможи</string>
+  <string name="charging_sounds_enabled_summary">Репродуцирај звук при поврзување или исклучување на извор на енергија</string>
+  <string name="power_notifications_vibrate_title">Вибрација</string>
+  <string name="charging_sounds_ringtone_title">Звук за известување</string>
+  <string name="charging_sounds_ringtone_silent">Тивко</string>
+  <!-- Gestures: Touchscreen gestures -->
+  <string name="touchscreen_gesture_settings_title">Гестови на допир</string>
+  <string name="touchscreen_gesture_settings_summary">Изведување на различни гестови на допир за брзо дејство</string>
+  <string name="touchscreen_gestures_haptic_feedback_title">Допирни повратни информации</string>
+  <string name="touchscreen_gestures_haptic_feedback_summary">Вибрација кога ќе се препознае гест на допир</string>
+  <string name="touchscreen_gesture_two_finger_down_swipe_title">Повлечете надолу со два прста</string>
+  <string name="touchscreen_gesture_one_finger_up_swipe_title">Повлечете нагоре со еден прст</string>
+  <string name="touchscreen_gesture_one_finger_down_swipe_title">Повлечете надолу со еден прст</string>
+  <string name="touchscreen_gesture_one_finger_left_swipe_title">Повлечете налево со еден прст</string>
+  <string name="touchscreen_gesture_one_finger_right_swipe_title">Повлечете надесно со еден прст</string>
+  <string name="touchscreen_gesture_up_arrow_title">Нацртајте \"Λ\"</string>
+  <string name="touchscreen_gesture_down_arrow_title">Нацртајте \"V\"</string>
+  <string name="touchscreen_gesture_left_arrow_title">Нацртајте \"&lt;\"</string>
+  <string name="touchscreen_gesture_right_arrow_title">Нацртајте \"&gt;\"</string>
+  <string name="touchscreen_gesture_letter_c_title">Нацртајте ја буквата \"C\"</string>
+  <string name="touchscreen_gesture_letter_e_title">Нацртајте ја буквата \"e\"</string>
+  <string name="touchscreen_gesture_letter_o_title">Нацртајте ја буквата \"O\"</string>
+  <string name="touchscreen_gesture_letter_m_title">Нацртајте ја буквата \"M\"</string>
+  <string name="touchscreen_gesture_letter_s_title">Нацртајте ја буквата \"S\"</string>
+  <string name="touchscreen_gesture_letter_v_title">Нацртајте ја буквата \"V\"</string>
+  <string name="touchscreen_gesture_letter_w_title">Нацртајте ја буквата \"W\"</string>
+  <string name="touchscreen_gesture_letter_z_title">Нацртајте ја буквата \"Z\"</string>
+  <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Повлечете нагоре со иглата</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Повлечете надолу со иглата</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Повлечете налево со иглата</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Повлечете надесно со иглата</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Долг притисок со иглата</string>
+  <string name="touchscreen_gesture_action_dialog_title">Акција на гест</string>
+  <string name="touchscreen_gesture_action_do_nothing">Не прави ништо</string>
+  <string name="touchscreen_gesture_action_flashlight">Уклучи/Исклучи ја светилката</string>
+  <string name="touchscreen_gesture_action_camera">Отвори ја камерата</string>
+  <string name="touchscreen_gesture_action_browser">Отвори го пребарувачот</string>
+  <string name="touchscreen_gesture_action_dialer">Отвори го бирачот</string>
+  <string name="touchscreen_gesture_action_email">Погледни ги е-пораки</string>
+  <string name="touchscreen_gesture_action_messages">Преглед на пораки</string>
+  <string name="touchscreen_gesture_action_play_pause_music">Репродуцирај/паузирај репродукција на музика</string>
+  <string name="touchscreen_gesture_action_previous_track">Префрли на претходната музичка песна</string>
+  <string name="touchscreen_gesture_action_next_track">Прескони на следната музичка песна</string>
+  <string name="touchscreen_gesture_action_volume_down">Намали го гласот за музика</string>
+  <string name="touchscreen_gesture_action_volume_up">Зголеми го гласот за музика</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
+</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ml-rIN/plurals.xml b/res/values-ml/plurals.xml
similarity index 100%
rename from res/values-ml-rIN/plurals.xml
rename to res/values-ml/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ml/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ml/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-mn-rMN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-mn-rMN/plurals.xml b/res/values-mn/plurals.xml
similarity index 100%
rename from res/values-mn-rMN/plurals.xml
rename to res/values-mn/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-mn/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-mn/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-mr-rIN/plurals.xml b/res/values-mr/plurals.xml
similarity index 100%
rename from res/values-mr-rIN/plurals.xml
rename to res/values-mr/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-mr/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-mr/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ms-rMY/plurals.xml b/res/values-ms/plurals.xml
similarity index 100%
rename from res/values-ms-rMY/plurals.xml
rename to res/values-ms/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ms/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ms/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-my-rMM/plurals.xml b/res/values-my/plurals.xml
similarity index 100%
rename from res/values-my-rMM/plurals.xml
rename to res/values-my/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-my/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-my/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-my/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d92d3d8..8c6bbba 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS Innstillinger</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Laster inn\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Søk</string>
   <string name="disabled">Deaktivert</string>
   <string name="enabled">Aktivert</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Personvern</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Langsom</string>
   <string name="pulse_speed_very_slow">Veldig langsom</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Batterilys</string>
   <string name="battery_low_pulse_title">Pulsér ved lavt batterinivå</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Hjem dobbelttrykk handling</string>
   <!-- Power menu -->
   <string name="power_menu_title">Av/På meny</string>
-  <string name="power_menu_reboot_title">Omstartsmeny</string>
   <string name="power_menu_screenshot_title">Skjermbilde</string>
   <string name="power_menu_airplane_title">Flymodus</string>
   <string name="power_menu_users_title">Brukerbytte</string>
-  <string name="power_menu_settings_title">Innstillinger snarvei</string>
-  <string name="power_menu_lockdown_title">Nedlåsing av enhet</string>
   <string name="power_menu_bug_report_title">Feilrapport</string>
-  <string name="power_menu_sound_title">Lyd-panel</string>
   <string name="power_menu_bug_report_disabled">Feilrapportering er deaktivert i innstillingene for utvikling</string>
   <string name="volume_keys_control_ring_stream_title">Ringetone volumkontroll</string>
   <string name="volume_keys_control_ring_stream_summary_on">Volumtastene styrer ringetonevolum</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statuslinjeikoner</string>
   <string name="status_bar_icons_summary">Kontroller hvilke av status ikonene som skal vises</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Beskyttede apper</string>
   <string name="protected_apps_manager_summary">Administrer hvilke apper som er skjult bak en sikkerhetslås</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Spill av/pause musikkavspilling</string>
   <string name="touchscreen_gesture_action_previous_track">Gå til forrige musikkspor</string>
   <string name="touchscreen_gesture_action_next_track">Hopp til neste musikkspor</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ne-rNP/plurals.xml b/res/values-ne/plurals.xml
similarity index 100%
rename from res/values-ne-rNP/plurals.xml
rename to res/values-ne/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ne/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ne/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ne/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 959dbf4..d721201 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">LineageOS-instellingen</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Laden\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Zoeken</string>
   <string name="disabled">Uitgeschakeld</string>
   <string name="enabled">Ingeschakeld</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacy</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normaal</string>
   <string name="pulse_speed_slow">Langzaam</string>
   <string name="pulse_speed_very_slow">Heel langzaam</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Acculed</string>
   <string name="battery_low_pulse_title">Knipperen bij lage accuspanning</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Thuisknop twee keer indrukken</string>
   <!-- Power menu -->
   <string name="power_menu_title">Opties in afsluitmenu</string>
-  <string name="power_menu_reboot_title">Herstarten</string>
   <string name="power_menu_screenshot_title">Screenshot</string>
   <string name="power_menu_airplane_title">Vliegtuigmodus</string>
   <string name="power_menu_users_title">Gebruiker wisselen</string>
-  <string name="power_menu_settings_title">Snelkoppeling voor instellingen</string>
-  <string name="power_menu_lockdown_title">Apparaat vergrendelen</string>
   <string name="power_menu_bug_report_title">Foutenrapport</string>
-  <string name="power_menu_sound_title">Geluidspaneel</string>
   <string name="power_menu_bug_report_disabled">Foutrapportage is uitgeschakeld in de opties voor ontwikkelaars</string>
   <string name="volume_keys_control_ring_stream_title">Beltoonvolume beheren</string>
   <string name="volume_keys_control_ring_stream_summary_on">Volumeknoppen passen beltoonvolume aan</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statusbalkpictogrammen</string>
   <string name="status_bar_icons_summary">Bepalen welke statusbalkpictogrammen worden weergegeven</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Beschermde apps</string>
   <string name="protected_apps_manager_summary">Beheren welke apps beschermd zijn</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Muziek afspelen/pauzeren</string>
   <string name="touchscreen_gesture_action_previous_track">Ga terug naar vorige nummer</string>
   <string name="touchscreen_gesture_action_next_track">Spring naar volgende nummer</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-oc-rFR/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-oc-rFR/plurals.xml b/res/values-oc/plurals.xml
similarity index 100%
rename from res/values-oc-rFR/plurals.xml
rename to res/values-oc/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-oc/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-oc/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-oc/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-pa-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-pa-rIN/plurals.xml b/res/values-pa/plurals.xml
similarity index 100%
rename from res/values-pa-rIN/plurals.xml
rename to res/values-pa/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-pa/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-pa/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 97aac83..1a203d6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Ustawienia LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Ładowanie\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -31,13 +30,13 @@
   <string name="back">Wróć</string>
   <string name="finish">Zakończ</string>
   <string name="next">Dalej</string>
-  <string name="on">Wł.</string>
   <string name="off">Wyłączone</string>
   <string name="yes">Tak</string>
   <string name="no">Nie</string>
   <string name="search">Szukaj</string>
   <string name="disabled">Wyłączone</string>
   <string name="enabled">Włączono</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Prywatność</string>
   <!-- Privacy Guard -->
@@ -75,6 +74,10 @@
   <string name="pulse_speed_normal">Normalnie</string>
   <string name="pulse_speed_slow">Wolno</string>
   <string name="pulse_speed_very_slow">Bardzo wolno</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Poziomy jasności</string>
+  <string name="light_brightness_normal">Normalny</string>
+  <string name="light_brightness_zen">Nie przeszkadzać</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Dioda baterii</string>
   <string name="battery_low_pulse_title">Migaj, gdy poziom baterii jest niski</string>
@@ -135,7 +138,6 @@
   <string name="live_display_color_profile_reading_title">Czytanie</string>
   <string name="live_display_color_profile_reading_summary">Cieplejsze kolory, aby ograniczyć zmęczenie oczu</string>
   <string name="live_display_color_profile_srgb_title">sRGB</string>
-  <string name="live_display_color_profile_srgb_summary">Kolory dokładne z przestrzenią kolorów sRGB</string>
   <string name="live_display_color_profile_dci_p3_title">DCI-P3</string>
   <string name="color_calibration_title">Kalibracja kolorów</string>
   <string name="color_calibration_summary">Kalibruj kolory wyświetlacza</string>
@@ -159,8 +161,6 @@
   <string name="hardware_keys_appswitch_key_title">Przycisk ostatnich aplikacji</string>
   <string name="hardware_keys_camera_key_title">Przycisk aparatu</string>
   <string name="hardware_keys_volume_keys_title">Przyciski głośności</string>
-  <string name="hardware_keys_short_press_title">Krótkie naciśnięcie</string>
-  <string name="hardware_keys_long_press_title">Długie naciśnięcie</string>
   <string name="hardware_keys_double_tap_title">Akcja podwójnego naciśnięcia</string>
   <string name="hardware_keys_action_nothing">Brak akcji</string>
   <string name="hardware_keys_action_menu">Otwórz/zamknij menu</string>
@@ -193,6 +193,8 @@
   <string name="volume_answer_call_summary">Odbieranie połączeń przychodzących za pomocą przycisków głośności</string>
   <string name="home_answer_call_title">Odbierz połączenie</string>
   <string name="home_answer_call_summary">Odbieraj połączenia przychodzące za pomocą przycisku Home</string>
+  <string name="extras_title">Dodatki</string>
+  <string name="additional_buttons_title">Dodatkowe przyciski</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Podświetlenie</string>
   <string name="button_backlight_enabled">Podświetlenie przycisków</string>
@@ -215,16 +217,14 @@
   <string name="navigation_bar_arrow_keys_summary">Pokaż przyciski lewego i prawego kursora podczas pisania. Zastępuje przełącznik IME.</string>
   <string name="navigation_bar_home_long_press_title">Akcja długiego naciśnięcia Home</string>
   <string name="navigation_bar_home_double_tap_title">Akcja podwójnego puknięcia Home</string>
+  <string name="navigation_bar_app_switch_long_press_title">Akcja długiego naciśnięcia Ostatnio Używanych</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menu zasilania</string>
-  <string name="power_menu_reboot_title">Menu ponownego uruchomienia</string>
   <string name="power_menu_screenshot_title">Zrzut ekranu</string>
+  <string name="power_menu_screenshot_summary">Naciśnij i przytrzymaj by wykonać częściowy zrzut ekranu</string>
   <string name="power_menu_airplane_title">Tryb samolotowy</string>
   <string name="power_menu_users_title">Przełącznik użytkowników</string>
-  <string name="power_menu_settings_title">Skrót do ustawień</string>
-  <string name="power_menu_lockdown_title">Blokowanie urządzenia</string>
   <string name="power_menu_bug_report_title">Zgłoszenie błędu</string>
-  <string name="power_menu_sound_title">Panel dźwięków</string>
   <string name="power_menu_bug_report_disabled">Raportowanie błędów jest wyłączone w opcjach programistycznych</string>
   <string name="volume_keys_control_ring_stream_title">Regulacja głośności dzwonka</string>
   <string name="volume_keys_control_ring_stream_summary_on">Przyciski głośności regulują głośność dzwonka</string>
@@ -428,6 +428,20 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikony paska stanu</string>
   <string name="status_bar_icons_summary">Wybierz, które ikony będą wyświetlane na pasku stanu</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitor ruchu sieciowego</string>
+  <string name="network_traffic_settings_summary">Pokaż bieżące poziomy ruchu sieciowego na pasku stanu</string>
+  <string name="network_traffic_mode_title">Tryb wyświetlania</string>
+  <string name="network_traffic_mode_up">Tylko wysyłanie</string>
+  <string name="network_traffic_mode_down">Tylko pobieranie</string>
+  <string name="network_traffic_mode_all">Wysyłanie i pobieranie</string>
+  <string name="network_traffic_autohide">Autoukrywanie</string>
+  <string name="network_traffic_autohide_summary">Ukryj monitor ruchu, przy braku aktywności</string>
+  <string name="network_traffic_units_title">Jednostki pomiaru ruchu</string>
+  <string name="network_traffic_units_kilobits">Kilobity na sekundę (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabity na sekundę (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobajty na sekundę (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabajty na sekundę (MB/s)</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Chronione aplikacje</string>
   <string name="protected_apps_manager_summary">Zarządzaj, które aplikacje mają być ukryte za bezpieczną blokadą</string>
@@ -546,6 +560,11 @@
   <string name="touchscreen_gesture_letter_w_title">Narysuj literę \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Narysuj literę \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Przesuń rysikiem w górę</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Przesuń rysikiem w dół</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Przesuń rysikiem w lewo</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Przesuń rysikiem w prawo</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Długie przytrzymanie rysika</string>
   <string name="touchscreen_gesture_action_dialog_title">Gest akcji</string>
   <string name="touchscreen_gesture_action_do_nothing">Nic nie rób</string>
   <string name="touchscreen_gesture_action_flashlight">Przełącznik latarki</string>
@@ -557,4 +576,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Rozpoczęcie/wstrzymanie odtwarzania muzyki</string>
   <string name="touchscreen_gesture_action_previous_track">Przejdź do poprzedniego utworu muzycznego</string>
   <string name="touchscreen_gesture_action_next_track">Przejdź do następnego utworu muzycznego</string>
+  <string name="touchscreen_gesture_action_volume_down">Mniejsza głośność multimediów</string>
+  <string name="touchscreen_gesture_action_volume_up">Większa głośność multimediów</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 176dfa7..fc5929c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Configurações LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Carregando\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Procurar</string>
   <string name="disabled">Desabilitado</string>
   <string name="enabled">Habilitado</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacidade</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lento</string>
   <string name="pulse_speed_very_slow">Muito lento</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Luz da bateria</string>
   <string name="battery_low_pulse_title">Pulsar quando a bateria estiver baixa</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Ação de toque duplo no botão de Página Inicial</string>
   <!-- Power menu -->
   <string name="power_menu_title">Opções do botão liga/desliga</string>
-  <string name="power_menu_reboot_title">Menu de reinicialização</string>
   <string name="power_menu_screenshot_title">Captura de tela</string>
   <string name="power_menu_airplane_title">Modo avião</string>
   <string name="power_menu_users_title">Alternador de usuário</string>
-  <string name="power_menu_settings_title">Atalho para as configurações</string>
-  <string name="power_menu_lockdown_title">Bloqueio de dispositivo</string>
   <string name="power_menu_bug_report_title">Relatório de erros</string>
-  <string name="power_menu_sound_title">Painel de som</string>
   <string name="power_menu_bug_report_disabled">Relatório de erros desativado nas configurações de desenvolvedor</string>
   <string name="volume_keys_control_ring_stream_title">Controle de volume do toque</string>
   <string name="volume_keys_control_ring_stream_summary_on">Botões de volume controlam o volume do toque</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ícones da barra de status</string>
   <string name="status_bar_icons_summary">Controle quais ícones da barra de status são mostrados</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Apps protegidos</string>
   <string name="protected_apps_manager_summary">Gerencie quais aplicativos ficam escondidos atrás da trava de segurança</string>
@@ -545,6 +543,11 @@
   <string name="touchscreen_gesture_letter_w_title">Desenhar a letra \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Desenhar a letra \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Deslizar para cima com a caneta</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Deslizar para baixo com a caneta</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Deslizar para a esquerda com a caneta</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Deslizar para a direita com a caneta</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Pressionar e segurar com a caneta</string>
   <string name="touchscreen_gesture_action_dialog_title">Ação do gesto</string>
   <string name="touchscreen_gesture_action_do_nothing">Não fazer nada</string>
   <string name="touchscreen_gesture_action_flashlight">Ligar/desligar a lanterna</string>
@@ -556,4 +559,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reproduzir/pausar a reprodução de música</string>
   <string name="touchscreen_gesture_action_previous_track">Retroceder para a faixa de música anterior</string>
   <string name="touchscreen_gesture_action_next_track">Avançar para a próxima faixa de música</string>
+  <string name="touchscreen_gesture_action_volume_down">Diminuir o volume de mídia</string>
+  <string name="touchscreen_gesture_action_volume_up">Aumentar o volume de mídia</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ee06613..2de77a9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Pesquisar</string>
   <string name="disabled">Desativada</string>
   <string name="enabled">Ativada</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privacidade</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Lenta</string>
   <string name="pulse_speed_very_slow">Muito lenta</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Níveis de brilho</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Não Incomodar</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Luz da bateria</string>
   <string name="battery_low_pulse_title">Piscar se a bateria estiver fraca</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Atender chamadas pressionando os botões de volume</string>
   <string name="home_answer_call_title">Atender chamada</string>
   <string name="home_answer_call_summary">Atender chamadas pressionando o botão Página Inicial</string>
+  <string name="extras_title">Extras</string>
+  <string name="additional_buttons_title">Botões adicionais</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Luz de fundo</string>
   <string name="button_backlight_enabled">Iluminar os botões</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Mostrar os botões de cursor para a esquerda e para a direita enquanto escreve. Sobrepõe-se à definição do teclado.</string>
   <string name="navigation_bar_home_long_press_title">Ação de pressão longa no botão de Página Inicial</string>
   <string name="navigation_bar_home_double_tap_title">Toque duplo</string>
+  <string name="navigation_bar_app_switch_long_press_title">Ação de pressão longa no botão de Visão geral</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menu ligar/desligar</string>
-  <string name="power_menu_reboot_title">Menu de reinicialização</string>
   <string name="power_menu_screenshot_title">Capturar ecrã</string>
+  <string name="power_menu_screenshot_summary">Pressão longa para captura de ecrã parcial</string>
   <string name="power_menu_airplane_title">Modo de avião</string>
   <string name="power_menu_users_title">Mudar utilizador</string>
-  <string name="power_menu_settings_title">Atalho das definições</string>
-  <string name="power_menu_lockdown_title">Bloqueio do dispositivo</string>
   <string name="power_menu_bug_report_title">Relatório de erros</string>
-  <string name="power_menu_sound_title">Painel de som</string>
   <string name="power_menu_bug_report_disabled">O relatório de erros está desativado nas opções de programador</string>
   <string name="volume_keys_control_ring_stream_title">Controlo do volume do toque</string>
   <string name="volume_keys_control_ring_stream_summary_on">As teclas de volume controlam o volume do toque de chamada</string>
@@ -379,7 +384,7 @@
   <string name="doze_title">Visualização de ambiente</string>
   <!-- Status bar -->
   <string name="status_bar_title">Barra de estado</string>
-  <string name="status_bar_quick_qs_pulldown_title">Puxar para baixo</string>
+  <string name="status_bar_quick_qs_pulldown_title">Abertura rápida</string>
   <string name="status_bar_quick_qs_pulldown_summary">O %1$s da barra de estado faz baixar o painel de definições rápidas</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">canto esquerdo</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">canto direito</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ícones da barra de estado</string>
   <string name="status_bar_icons_summary">Controlar que ícones da barra de estado são mostrados</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitor de tráfego de rede</string>
+  <string name="network_traffic_settings_summary">Mostrar na barra de estado os níveis de tráfego de rede atual</string>
+  <string name="network_traffic_mode_title">Modo de visualização</string>
+  <string name="network_traffic_mode_disable">Desativado</string>
+  <string name="network_traffic_mode_up">Apenas envio</string>
+  <string name="network_traffic_mode_down">Apenas receção</string>
+  <string name="network_traffic_mode_all">Envio e receção</string>
+  <string name="network_traffic_autohide">Ocultar automaticamente</string>
+  <string name="network_traffic_autohide_summary">Ocultar o monitor de tráfego quando não houver atividade</string>
+  <string name="network_traffic_units_title">Unidades de medida do tráfego</string>
+  <string name="network_traffic_units_kilobits">Kilobits por segundo (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabits por segundo (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes por segundo (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes por segundo (MB/s)</string>
+  <string name="network_traffic_show_units">Mostrar unidades</string>
+  <string name="network_traffic_show_units_summary">Mostrar as unidades de medida do tráfego na barra de estado</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicações protegidas</string>
   <string name="protected_apps_manager_summary">Gerir as aplicações que estão protegidas pelo bloqueio seguro</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Desenhar a letra \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Desenhar a letra \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Deslizar para cima com a caneta</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Deslizar para baixo com a caneta</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Deslizar para a esquerda com a caneta</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Deslizar para a direita com a caneta</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Pressão longa com a caneta</string>
   <string name="touchscreen_gesture_action_dialog_title">Ação do gesto</string>
   <string name="touchscreen_gesture_action_do_nothing">Não fazer nada</string>
   <string name="touchscreen_gesture_action_flashlight">Ligar/desligar a lanterna</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Reproduzir/pausar a reprodução de música</string>
   <string name="touchscreen_gesture_action_previous_track">Retroceder para a faixa de música anterior</string>
   <string name="touchscreen_gesture_action_next_track">Avançar para a faixa de música seguinte</string>
+  <string name="touchscreen_gesture_action_volume_down">Diminuir o volume multimédia</string>
+  <string name="touchscreen_gesture_action_volume_up">Aumentar o volume multimédia</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a7d4c37..b77e201 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Căutați</string>
   <string name="disabled">Dezactivat</string>
   <string name="enabled">Activat</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Intimitate</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Încet</string>
   <string name="pulse_speed_very_slow">Foarte încet</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Nivelele luminozității</string>
+  <string name="light_brightness_normal">Normală</string>
+  <string name="light_brightness_zen">Nu Deranja</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Lumină baterie</string>
   <string name="battery_low_pulse_title">Pulsează dacă bateria este slabă</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Răspundeți la apelurile de intrare apăsând butoanele de volum</string>
   <string name="home_answer_call_title">Răspundere apel</string>
   <string name="home_answer_call_summary">Răspundeți la apelurile de intrare apăsând butonul acasă</string>
+  <string name="extras_title">Mai multe</string>
+  <string name="additional_buttons_title">Butoane suplimentare</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Iluminare butoane</string>
   <string name="button_backlight_enabled">Iluminare butoane</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Arată butoanele de cursor stânga şi dreapta în timp ce tastaţi. Înlocuieşte comutatorul IME.</string>
   <string name="navigation_bar_home_long_press_title">Acțiunea apăsării lungi pe Acasă</string>
   <string name="navigation_bar_home_double_tap_title">Acțiunea apăsării duble pe Acasă</string>
+  <string name="navigation_bar_app_switch_long_press_title">Acțiunea apăsării lungi pe Recente</string>
   <!-- Power menu -->
   <string name="power_menu_title">Meniul power</string>
-  <string name="power_menu_reboot_title">Meniu repornire</string>
   <string name="power_menu_screenshot_title">Captură de ecran</string>
+  <string name="power_menu_screenshot_summary">Atingere lungă pentru screenshot parțial</string>
   <string name="power_menu_airplane_title">Mod Avion</string>
   <string name="power_menu_users_title">Comutator utilizatori</string>
-  <string name="power_menu_settings_title">Comandă rapidă pentru Setări</string>
-  <string name="power_menu_lockdown_title">Blocare dispozitiv</string>
   <string name="power_menu_bug_report_title">Raport de eroare</string>
-  <string name="power_menu_sound_title">Panou sunet</string>
   <string name="power_menu_bug_report_disabled">Raportarea erorilor este dezactivată în setările pentru dezvoltatori</string>
   <string name="volume_keys_control_ring_stream_title">Controlează volumul soneriei</string>
   <string name="volume_keys_control_ring_stream_summary_on">Butoanele de volum controlează volumul tonului de apel</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Pictograme bară de stare</string>
   <string name="status_bar_icons_summary">Controlați care pictograme din bara de stare sunt afișate</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitorizare trafic rețea</string>
+  <string name="network_traffic_settings_summary">Afișează nivelele curente ale traficului rețelei în bara de stare</string>
+  <string name="network_traffic_mode_title">Mod de afișare</string>
+  <string name="network_traffic_mode_disable">Dezactivat</string>
+  <string name="network_traffic_mode_up">Doar upload</string>
+  <string name="network_traffic_mode_down">Doar download</string>
+  <string name="network_traffic_mode_all">Încărcare și descărcare</string>
+  <string name="network_traffic_autohide">Ascundere automată</string>
+  <string name="network_traffic_autohide_summary">Ascunde monitorul de trafic atunci când nu există nici o activitate</string>
+  <string name="network_traffic_units_title">Unități de măsurare trafic</string>
+  <string name="network_traffic_units_kilobits">Kilobiţi pe secundă (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabiţi pe secundă (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobytes pe secundă (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabytes pe secundă (MB/s)</string>
+  <string name="network_traffic_show_units">Arată unităţi</string>
+  <string name="network_traffic_show_units_summary">Afișarea unităților de măsurare ale traficului în bara de stare</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplicații protejate</string>
   <string name="protected_apps_manager_summary">Gestionați care aplicații sunt ascunse după o blocare sigură</string>
@@ -547,6 +569,11 @@
   <string name="touchscreen_gesture_letter_w_title">Desenați litera \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Desenați litera \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Glisați în sus cu stylus-ul</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Glisați în jos cu stylus-ul</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Glisați în stânga cu stylus-ul</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Glisați în dreapta cu stylus-ul</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Apăsaţi lung cu stylus-ul</string>
   <string name="touchscreen_gesture_action_dialog_title">Acțiune gest</string>
   <string name="touchscreen_gesture_action_do_nothing">Nu fă nimic</string>
   <string name="touchscreen_gesture_action_flashlight">Comută lanterna</string>
@@ -558,4 +585,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Redare/pauză redarea muzicii</string>
   <string name="touchscreen_gesture_action_previous_track">Navigaţi la piesa anterioară</string>
   <string name="touchscreen_gesture_action_next_track">Treceți la următoarea piesă</string>
+  <string name="touchscreen_gesture_action_volume_down">Micșorează volumul media</string>
+  <string name="touchscreen_gesture_action_volume_up">Mărește volumul media</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c6f1e2f..584aef8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Поиск</string>
   <string name="disabled">Выключен</string>
   <string name="enabled">Включен</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Конфиденциальность</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Обычный</string>
   <string name="pulse_speed_slow">Медленно</string>
   <string name="pulse_speed_very_slow">Очень медленно</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Уровень яркости</string>
+  <string name="light_brightness_normal">Стандартный</string>
+  <string name="light_brightness_zen">Не беспокоить</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Индикация батареи</string>
   <string name="battery_low_pulse_title">Мигать при низком уровне заряда</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Отвечать на телефонный вызов нажатием кнопок громкости</string>
   <string name="home_answer_call_title">Ответ на вызов</string>
   <string name="home_answer_call_summary">Отвечать на входящий вызов нажатием кнопки «Домой»</string>
+  <string name="extras_title">Дополнительно</string>
+  <string name="additional_buttons_title">Дополнительные кнопки</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Подсветка</string>
   <string name="button_backlight_enabled">Подсветка кнопок</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Отображать кнопки перемещения курсора влево или вправо при вводе текста. Кнопка выбора метода ввода отображаться не будет.</string>
   <string name="navigation_bar_home_long_press_title">Долгое нажатие кнопки «Домой»</string>
   <string name="navigation_bar_home_double_tap_title">Двойное нажатие кнопки «Домой»</string>
+  <string name="navigation_bar_app_switch_long_press_title">Долгое нажатие кнопки «Недавние»</string>
   <!-- Power menu -->
   <string name="power_menu_title">Меню кнопки питания</string>
-  <string name="power_menu_reboot_title">Меню перезапуска</string>
   <string name="power_menu_screenshot_title">Скриншот</string>
+  <string name="power_menu_screenshot_summary">Удерживайте, чтобы выделить область для скриншота</string>
   <string name="power_menu_airplane_title">Режим полета</string>
   <string name="power_menu_users_title">Переключение пользователей</string>
-  <string name="power_menu_settings_title">Ярлык настроек</string>
-  <string name="power_menu_lockdown_title">Блокировка устройства</string>
   <string name="power_menu_bug_report_title">Отчет об ошибке</string>
-  <string name="power_menu_sound_title">Звуковая панель</string>
   <string name="power_menu_bug_report_disabled">Отчет об ошибке отключен в настройках для разработчика</string>
   <string name="volume_keys_control_ring_stream_title">Регулировка громкости рингтона</string>
   <string name="volume_keys_control_ring_stream_summary_on">Кнопки громкости регулируют громкость рингтона</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Значки в строке состояния</string>
   <string name="status_bar_icons_summary">Настройка видимости значков</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Индикатор сетевого трафика</string>
+  <string name="network_traffic_settings_summary">Отображать текущую скорость соединения в строке состояния</string>
+  <string name="network_traffic_mode_title">Режим отображения</string>
+  <string name="network_traffic_mode_disable">Отключено</string>
+  <string name="network_traffic_mode_up">Только исходящий трафик </string>
+  <string name="network_traffic_mode_down">Только входящий трафик</string>
+  <string name="network_traffic_mode_all">Исходящий и входящий трафик</string>
+  <string name="network_traffic_autohide">Автоскрытие</string>
+  <string name="network_traffic_autohide_summary">Скрывать индикатор трафика, когда нет активности</string>
+  <string name="network_traffic_units_title">Единицы измерения трафика</string>
+  <string name="network_traffic_units_kilobits">Килобит в секунду (кбит/с)</string>
+  <string name="network_traffic_units_megabits">Мегабит в секунду (Мбит/с)</string>
+  <string name="network_traffic_units_kilobytes">Килобайт в секунду (кБ/с)</string>
+  <string name="network_traffic_units_megabytes">Мегабайт в секунду (МБ/с)</string>
+  <string name="network_traffic_show_units">Показать единицы</string>
+  <string name="network_traffic_show_units_summary">Отображать скорость передачи данных в строке состояния</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Заблокированные приложения</string>
   <string name="protected_apps_manager_summary">Управление приложениями, для запуска которых требуется ввод пароля</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Нарисовать букву «W»</string>
   <string name="touchscreen_gesture_letter_z_title">Нарисовать букву «Z»</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Провести вверх стилусом</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Провести вниз стилусом</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Провести влево стилусом</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Провести вправо стилусом</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Долгое нажатие стилусом</string>
   <string name="touchscreen_gesture_action_dialog_title">Действие жеста</string>
   <string name="touchscreen_gesture_action_do_nothing">Ничего</string>
   <string name="touchscreen_gesture_action_flashlight">Включить или выключить фонарик</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Воспр. или остановить музыку</string>
   <string name="touchscreen_gesture_action_previous_track">Перейти к предыдущему треку</string>
   <string name="touchscreen_gesture_action_next_track">Перейти к следующему треку</string>
+  <string name="touchscreen_gesture_action_volume_down">Уменьшить громкость</string>
+  <string name="touchscreen_gesture_action_volume_up">Увеличить громкость</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-frp-rIT/plurals.xml b/res/values-sc-rIT/plurals.xml
similarity index 100%
rename from res/values-frp-rIT/plurals.xml
rename to res/values-sc-rIT/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-sc-rIT/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-sc-rIT/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-sc-rIT/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-si-rLK/plurals.xml b/res/values-si/plurals.xml
similarity index 100%
rename from res/values-si-rLK/plurals.xml
rename to res/values-si/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-si/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-si/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-si/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c5e2f67..f619b7a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Vyhľadať</string>
   <string name="disabled">Zakázané</string>
   <string name="enabled">Povolené</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Súkromie</string>
   <!-- Privacy Guard -->
@@ -57,7 +58,7 @@
   <string name="privacy_guard_notification_title">Zobraziť upozornenia</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Upraviť svetelnú signalizáciu</string>
-  <string name="pulse_speed_title">Dĺžka a rýchlosť pulzov</string>
+  <string name="pulse_speed_title">Dĺžka a rýchlosť blikania</string>
   <string name="default_time">Normálny</string>
   <string name="custom_time">Vlastný</string>
   <string name="dialog_delete_title">Vymazať</string>
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normálne</string>
   <string name="pulse_speed_slow">Pomaly</string>
   <string name="pulse_speed_very_slow">Veľmi pomaly</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Úrovne jasu</string>
+  <string name="light_brightness_normal">Normalny</string>
+  <string name="light_brightness_zen">Režim Nerušiť</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Ukazovateľ batérie</string>
   <string name="battery_low_pulse_title">Blikať, keď je batéria vybitá</string>
@@ -93,7 +98,7 @@
   <string name="notification_light_missed_call_title">Zmeškaný hovor</string>
   <string name="notification_light_voicemail_title">Odkazová schránka</string>
   <string name="notification_light_screen_on">Upozorňovať pomocou LED pri zapnutej obrazovke</string>
-  <string name="notification_light_zen_mode">Svetelná signalizácia v režimu „Nerušiť“</string>
+  <string name="notification_light_zen_mode">LED signalizácia v režime Nerušiť</string>
   <string name="keywords_lights_brightness_level">stlmiť jas LED diód</string>
   <string name="notification_light_automagic">Automaticky zvoliť farby</string>
   <string name="notification_light_automagic_summary">Automaticky zvoliť farby</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Prijať prichádzajúci hovor stlačením niektorého z tlačidiel hlasitosti</string>
   <string name="home_answer_call_title">Prijať hovor</string>
   <string name="home_answer_call_summary">Prijať prichádzajúci hovor stlačením tlačidla Domov</string>
+  <string name="extras_title">Doplnky</string>
+  <string name="additional_buttons_title">Ďalšie tlačidlá</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Podsvietenie</string>
   <string name="button_backlight_enabled">Podsvietenie tlačidiel</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Zobraziť ľavé a pravé kurzorové tlačidlá pri písaní. Potlačí prepínač metódy vstupu.</string>
   <string name="navigation_bar_home_long_press_title">Akcia dlhého stlačenia tlačidla Domov</string>
   <string name="navigation_bar_home_double_tap_title">Akcia dvojkliku tlačidla Domov</string>
+  <string name="navigation_bar_app_switch_long_press_title">Akcia dlhého stlačenia tlačidla Nedávne</string>
   <!-- Power menu -->
   <string name="power_menu_title">Ponuka po stlačení tlačidla</string>
-  <string name="power_menu_reboot_title">Reštart menu</string>
   <string name="power_menu_screenshot_title">Snímka obrazovky</string>
+  <string name="power_menu_screenshot_summary">Dlhé stlačenie pre získanie čiastočnej snímky obrazovky</string>
   <string name="power_menu_airplane_title">Režim v lietadle</string>
   <string name="power_menu_users_title">Prepínač používateľov</string>
-  <string name="power_menu_settings_title">Odkaz nastavení</string>
-  <string name="power_menu_lockdown_title">Zamknúť zariadenie</string>
   <string name="power_menu_bug_report_title">Nahlásiť chybu</string>
-  <string name="power_menu_sound_title">Panel zvuku</string>
   <string name="power_menu_bug_report_disabled">Hlásenie chýb je zakázané v nastaveniach pre vývojárov</string>
   <string name="volume_keys_control_ring_stream_title">Ovládanie hlasitosti zvonenia</string>
   <string name="volume_keys_control_ring_stream_summary_on">Tlačidlá hlasitosti ovládajú hlasitosť zvonenia</string>
@@ -391,7 +396,7 @@
   <!-- Status bar - icons -->
   <string name="status_bar_icons_title">Ikony stavového riadku</string>
   <string name="status_bar_notif_count_title">Zobraziť počítadlo oznámení</string>
-  <string name="status_bar_notif_count_summary">Zobraziť počet čakajúcich oznámení na ikone v stavovom riadku</string>
+  <string name="status_bar_notif_count_summary">Zobraziť počet čakajúcich upozornení v stavovom riadku</string>
   <string name="status_bar_system_icons_title">Systémové ikony</string>
   <string name="status_bar_system_icons_summary">Upraviť zobrazenie ikon v stavovom riadku</string>
   <!-- Status bar - Clock -->
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikony stavového riadku</string>
   <string name="status_bar_icons_summary">Upraviť zobrazenie ikon v stavovom riadku</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Monitor sieťovej prevádzky</string>
+  <string name="network_traffic_settings_summary">Zobrazovať rýchlosť prenosu dát v stavovom riadku</string>
+  <string name="network_traffic_mode_title">Režim zobrazenia</string>
+  <string name="network_traffic_mode_disable">Vypnuté</string>
+  <string name="network_traffic_mode_up">Len odchádzajúce dáta</string>
+  <string name="network_traffic_mode_down">Len prichádzajúce dáta</string>
+  <string name="network_traffic_mode_all">Prichádzajúce a odchádzajúce dáta</string>
+  <string name="network_traffic_autohide">Automatické skrývanie</string>
+  <string name="network_traffic_autohide_summary">Skryť monitor sieťovej prevádzky pri neaktivite</string>
+  <string name="network_traffic_units_title">Jednotky merania sieťovej prevádzky</string>
+  <string name="network_traffic_units_kilobits">Kilobity za sekundu (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabity za sekundu (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobajty za sekundu (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabajty za sekundu (MB/s)</string>
+  <string name="network_traffic_show_units">Zobrazovať jednotky</string>
+  <string name="network_traffic_show_units_summary">Zobrazenie jednotiek merania sieť. prevádzky v stavovom riadku</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Chránené aplikácie</string>
   <string name="protected_apps_manager_summary">Spravovať aplikácie, ktoré sú skryté za bezpečným zámkom</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Nakreslite písmeno \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Nakreslite písmeno \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Potiahnutie dotykovým perom nahor</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Potiahnutie dotykovým perom nadol</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Potiahnutie dotykovým perom vľavo</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Potiahnutie dotykovým perom vpravo</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Dlhé stlačenie dotykovým perom</string>
   <string name="touchscreen_gesture_action_dialog_title">Gestá</string>
   <string name="touchscreen_gesture_action_do_nothing">Nerobiť nič</string>
   <string name="touchscreen_gesture_action_flashlight">Zapnúť baterku</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Spustiť/zastaviť prehrávanie hudby</string>
   <string name="touchscreen_gesture_action_previous_track">Spustiť predchádzajúcu skladbu</string>
   <string name="touchscreen_gesture_action_next_track">Preskočiť na ďalšiu skladbu</string>
+  <string name="touchscreen_gesture_action_volume_down">Zníženie hlasitosti médií</string>
+  <string name="touchscreen_gesture_action_volume_up">Zvýšenie hlasitosti médií</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5856320..3c93f09 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Išči</string>
   <string name="disabled">Onemogočeno</string>
   <string name="enabled">Omogočeno</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Zasebnost</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Običajna</string>
   <string name="pulse_speed_slow">Počasna</string>
   <string name="pulse_speed_very_slow">Zelo počasna</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Ravni svetlosti</string>
+  <string name="light_brightness_normal">Običajna</string>
+  <string name="light_brightness_zen">Ne moti</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Lučka za baterijo</string>
   <string name="battery_low_pulse_title">Utripaj, če je baterija skoraj prazna</string>
@@ -102,7 +107,7 @@
   <string name="led_notification_text">Lučka LED omogočena v nastavitvah</string>
   <string name="notification_light_no_apps_summary">Da dodate nadzor za posamezne aplikacije, omogočite \'%1$s\' in pritisnite \'\u002b\' v menijski vrstici</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">Optimiziraj zaslon glede na čas dneva in pogoje okolice, da se izboljša berljivost in zmanjša obremenitev oči</string>
+  <string name="live_display_summary">Optimiziranje zaslona glede na čas dneva in pogojev okolice, da se izboljša berljivost in zmanjša obremenitev oči</string>
   <string name="live_display_mode">Način prikaza</string>
   <string name="live_display_color_temperature_title">Temperatura barve</string>
   <string name="live_display_color_temperature_summary">Dan: <xliff:g id="day_temperature">%1$d</xliff:g> K Noč: <xliff:g id="night_temperature">%2$d</xliff:g> K</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Odgovori na dohodne klice s pritiskom na gumb za glasnost</string>
   <string name="home_answer_call_title">Odgovori na klic</string>
   <string name="home_answer_call_summary">Odgovori na dohodne klice s pritiskom na gumb Domov</string>
+  <string name="extras_title">Dodatki</string>
+  <string name="additional_buttons_title">Dodatni gumbi</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Osvetlitev ozadja</string>
   <string name="button_backlight_enabled">Osvetli gumbe</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Prikaži gumba levega in desnega kazalca med tipkanjem. Preglasi preklopnik IME.</string>
   <string name="navigation_bar_home_long_press_title">Dejanje dolgega pritiska Domov</string>
   <string name="navigation_bar_home_double_tap_title">Dejanje dvojnega tapa Domov</string>
+  <string name="navigation_bar_app_switch_long_press_title">Dejanje dolgega pritiska Nedavno</string>
   <!-- Power menu -->
   <string name="power_menu_title">Meni gumba za vklop/izklop</string>
-  <string name="power_menu_reboot_title">Meni ponovnega zagona</string>
   <string name="power_menu_screenshot_title">Zaslonska slika</string>
+  <string name="power_menu_screenshot_summary">Dolg pritisk za delno zaslonsko sliko</string>
   <string name="power_menu_airplane_title">Način za letalo</string>
   <string name="power_menu_users_title">Preklopnik uporabnikov</string>
-  <string name="power_menu_settings_title">Bližnjica nastavitev</string>
-  <string name="power_menu_lockdown_title">Zaklepanje naprave</string>
   <string name="power_menu_bug_report_title">Poročilo o hrošču</string>
-  <string name="power_menu_sound_title">Zvočna plošča</string>
   <string name="power_menu_bug_report_disabled">V nastavitvah za razvijalce je poročanje o hrošču onemogočeno</string>
   <string name="volume_keys_control_ring_stream_title">Nadzor glasnosti zvonjenja</string>
   <string name="volume_keys_control_ring_stream_summary_on">Gumba za glasnost nadzirata glasnost zvonjenja</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikone vrstice stanja</string>
   <string name="status_bar_icons_summary">Nadzor prikazanih ikon v vrstici stanja</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Nadzornik omrežnega prometa</string>
+  <string name="network_traffic_settings_summary">Prikaz trenutnih ravni omrežnega prometa v vrstici stanja</string>
+  <string name="network_traffic_mode_title">Način prikaza</string>
+  <string name="network_traffic_mode_disable">Onemogočen</string>
+  <string name="network_traffic_mode_up">Samo poslano</string>
+  <string name="network_traffic_mode_down">Samo prejeto</string>
+  <string name="network_traffic_mode_all">Poslano in prejeto</string>
+  <string name="network_traffic_autohide">Samodejno skrij</string>
+  <string name="network_traffic_autohide_summary">Skrij nadzornika prometa, ko ni dejavnosti</string>
+  <string name="network_traffic_units_title">Merske enote prometa</string>
+  <string name="network_traffic_units_kilobits">Kilobitov na sekundo (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabitov na sekundo (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobajtov na sekundo (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabajtov na sekundo (MB/s)</string>
+  <string name="network_traffic_show_units">Prikaži enote</string>
+  <string name="network_traffic_show_units_summary">Prikaz merskih enot prometa v vrstici stanja</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Zaščitene aplikacije</string>
   <string name="protected_apps_manager_summary">Upravljajte, katere aplikacije so skrite z varnim zaklepanjem</string>
@@ -547,6 +569,11 @@
   <string name="touchscreen_gesture_letter_w_title">Narišite črko \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Narišite črko \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Poteg navzgor s pisalom</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Poteg navzdol s pisalom</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Poteg levo s pisalom</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Poteg desno s pisalom</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Dolg pritisk s pisalom</string>
   <string name="touchscreen_gesture_action_dialog_title">Dejanje poteze</string>
   <string name="touchscreen_gesture_action_do_nothing">Ne naredi ničesar</string>
   <string name="touchscreen_gesture_action_flashlight">Vklop/izklop svetilke</string>
@@ -558,4 +585,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Predvajaj/začasno ustavi predvajanje glasbe</string>
   <string name="touchscreen_gesture_action_previous_track">Skok na prejšnjo skladbo</string>
   <string name="touchscreen_gesture_action_next_track">Skok na naslednjo skladbo</string>
+  <string name="touchscreen_gesture_action_volume_down">Zmanjšaj glasnost predstavnosti</string>
+  <string name="touchscreen_gesture_action_volume_up">Povečaj glasnost predstavnosti</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-sq-rAL/plurals.xml b/res/values-sq/plurals.xml
similarity index 100%
rename from res/values-sq-rAL/plurals.xml
rename to res/values-sq/plurals.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 98%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
index 943ca9e..5a670bd 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Parametrat e LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Duke u ngarkuar\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +37,7 @@
   <string name="search">Kërko</string>
   <string name="disabled">E çaktivizuar</string>
   <string name="enabled">E aktivizuar</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Privatësia</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Normale</string>
   <string name="pulse_speed_slow">E ngadaltë</string>
   <string name="pulse_speed_very_slow">Shumë e ngadaltë</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Drita e baterisë</string>
   <string name="battery_low_pulse_title">Pulso nëse bateria është e ulët</string>
@@ -216,14 +217,10 @@
   <string name="navigation_bar_home_double_tap_title">Shtypja dy herë e butonit Home</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menuja e energjisë</string>
-  <string name="power_menu_reboot_title">Menuja e rindezjes</string>
   <string name="power_menu_screenshot_title">Foto e ekranit</string>
   <string name="power_menu_airplane_title">Profili Avion</string>
   <string name="power_menu_users_title">Ndërruesi i përdoruesit</string>
-  <string name="power_menu_settings_title">Shkurtore për Parametrat</string>
-  <string name="power_menu_lockdown_title">Bllokim i pajisjes</string>
   <string name="power_menu_bug_report_title">Raportimi i problemeve</string>
-  <string name="power_menu_sound_title">Paneli i tingujve</string>
   <string name="power_menu_bug_report_disabled">Raportimi i problemeve është çaktivizuar në parametrat e zhvillimit</string>
   <string name="volume_keys_control_ring_stream_title">Kontrollo volumin e ziles</string>
   <string name="volume_keys_control_ring_stream_summary_on">Butonat e volumit kontrollojnë volumin e ziles</string>
@@ -414,6 +411,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Ikonat e shiritit të statusit</string>
   <string name="status_bar_icons_summary">Zgjidh cilat ikona do të shfaqen në shiritin e statusit</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Aplikacionet e mbrojtura</string>
   <string name="protected_apps_manager_summary">Cakto cilat aplikacione qëndrojnë të fshehura mbrapa një bllokimi të sigurtë</string>
@@ -536,4 +534,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Nis/ndalo muzikën</string>
   <string name="touchscreen_gesture_action_previous_track">Shko tek kënga e shkuar</string>
   <string name="touchscreen_gesture_action_next_track">Shko te kenga e radhës</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-sr-rCS/plurals.xml b/res/values-sr-rCS/plurals.xml
deleted file mode 100644
index 27ad002..0000000
--- a/res/values-sr-rCS/plurals.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR 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/res/values-sr-rCS/strings.xml b/res/values-sr-rCS/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-sr-rCS/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0f0bb7e..48a580d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Подешавања LineageOS-а</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Учитавам\u2026</string>
   <string name="dlg_ok">У реду</string>
@@ -38,6 +37,7 @@
   <string name="search">Претражи</string>
   <string name="disabled">Онемогућено</string>
   <string name="enabled">Омогућено</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Приватност</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Нормално</string>
   <string name="pulse_speed_slow">Споро</string>
   <string name="pulse_speed_very_slow">Веома споро</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Индикатор батерије</string>
   <string name="battery_low_pulse_title">Трепери ако је батерија на измаку</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Двоструки додир дугмета „Почетна“</string>
   <!-- Power menu -->
   <string name="power_menu_title">Мени за напајање</string>
-  <string name="power_menu_reboot_title">Мени за поновно покретање</string>
   <string name="power_menu_screenshot_title">Снимак екрана</string>
   <string name="power_menu_airplane_title">Режим рада у авиону</string>
   <string name="power_menu_users_title">Пребацивање корисника</string>
-  <string name="power_menu_settings_title">Пречица подешавања</string>
-  <string name="power_menu_lockdown_title">Закључавање уређаја</string>
   <string name="power_menu_bug_report_title">Пријава грешака</string>
-  <string name="power_menu_sound_title">Звучни панел</string>
   <string name="power_menu_bug_report_disabled">Пријава грешака је онемогућена у опцијама за програмера.</string>
   <string name="volume_keys_control_ring_stream_title">Управљање јачином звука звона</string>
   <string name="volume_keys_control_ring_stream_summary_on">Дугмад за јачину звука управљају јачином звука звона.</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Иконе у статусној траци</string>
   <string name="status_bar_icons_summary">Подесите које иконе ће бити приказане у статусној траци.</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Заштићене апликације</string>
   <string name="protected_apps_manager_summary">Управљајте апликацијама које за покретање захтевају унос лозинке.</string>
@@ -545,6 +543,11 @@
   <string name="touchscreen_gesture_letter_w_title">Нацртај слово „W“</string>
   <string name="touchscreen_gesture_letter_z_title">Нацртај слово „Z“</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Превуците нагоре са оловком</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Превуците доле са оловком</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Превуците налево са оловком</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Превуците десно са оловком</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Дуги притисак са оловком</string>
   <string name="touchscreen_gesture_action_dialog_title">Радња покрета</string>
   <string name="touchscreen_gesture_action_do_nothing">Ништа</string>
   <string name="touchscreen_gesture_action_flashlight">Укључи/искључи лампу</string>
@@ -556,4 +559,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Репродукуј/паузирај музику</string>
   <string name="touchscreen_gesture_action_previous_track">Пређи на претходну нумеру</string>
   <string name="touchscreen_gesture_action_next_track">Пређи на следећу нумеру</string>
+  <string name="touchscreen_gesture_action_volume_down">Смањи јачину звука</string>
+  <string name="touchscreen_gesture_action_volume_up">Повећај јачину звука</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 21b9bc2..b87e699 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Inställningar för LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Laddar\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,16 +37,19 @@
   <string name="search">Sök</string>
   <string name="disabled">Avaktiverad</string>
   <string name="enabled">Aktiverad</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Sekretess</string>
   <!-- Privacy Guard -->
   <string name="privacy_guard_no_user_apps">Inga appar är installerade</string>
   <string name="privacy_guard_help_title">Hjälp</string>
   <string name="privacy_guard_reset_title">Återställ</string>
+  <string name="privacy_guard_manager_show_system_apps">Visa inbyggda appar</string>
   <string name="privacy_guard_advanced_settings_title">Avancerade</string>
   <string name="privacy_guard_notification_title">Visa avisering</string>
   <!-- Notification light dialogs -->
   <string name="default_time">Normal</string>
+  <string name="custom_time">Anpassad</string>
   <string name="dialog_delete_title">Ta bort</string>
   <string name="brightness">Ljusstyrka</string>
   <!-- Values for the notification light pulse spinners -->
@@ -56,25 +58,39 @@
   <string name="pulse_length_short">Kort</string>
   <string name="pulse_length_normal">Normal</string>
   <string name="pulse_length_long">Lång</string>
+  <string name="pulse_length_very_long">Väldigt lång</string>
+  <string name="pulse_speed_very_fast">Väldigt snabb</string>
   <string name="pulse_speed_fast">Snabb</string>
   <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Långsam</string>
   <string name="pulse_speed_very_slow">Mycket långsam</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Ljusstyrka</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Stör ej</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Batteriljus</string>
+  <string name="battery_low_pulse_title">Pulsera vid låg batterinivå</string>
   <string name="battery_light_list_title">Färger</string>
+  <string name="battery_light_low_color_title">Låg batterinivå</string>
   <string name="battery_light_medium_color_title">Laddar</string>
   <string name="battery_light_full_color_title">Fulladdad</string>
   <!-- Lights settings screen, notification light settings -->
   <string name="notification_light_title">Aviseringsljus</string>
+  <string name="notification_light_general_title">Allmänt</string>
   <string name="notification_light_advanced_title">Avancerad</string>
   <string name="notification_light_applist_title">Appar</string>
   <string name="notification_light_phonelist_title">Telefon</string>
+  <string name="notification_light_use_custom">Använd anpassade värden</string>
   <string name="notification_light_default_value">Standard</string>
   <string name="notification_light_missed_call_title">Missat samtal</string>
   <string name="notification_light_voicemail_title">Röstbrevlåda</string>
+  <string name="notification_light_automagic">Välj färger automatiskt</string>
+  <string name="notification_light_automagic_summary">Väljer färger automatiskt</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ljusinställningar</string>
   <!-- LiveDisplay -->
+  <string name="live_display_mode">Visningsläge</string>
   <string name="live_display_color_temperature_title">Färgtemperatur</string>
   <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
   <string name="live_display_day">Dag</string>
@@ -86,6 +102,9 @@
   <string name="live_display_color_profile_cinema_title">Biograf</string>
   <string name="live_display_color_profile_astronomy_title">Astronomi</string>
   <string name="live_display_color_profile_photography_title">Fotografering</string>
+  <string name="live_display_color_profile_basic_title">Grundläggande</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptiv</string>
+  <string name="live_display_color_profile_reading_title">Läser</string>
   <string name="live_display_color_profile_srgb_title">sRGB</string>
   <string name="live_display_color_profile_dci_p3_title">DCI-P3</string>
   <string name="color_calibration_title">Färgkalibrering</string>
@@ -93,10 +112,16 @@
   <string name="color_green_title">Grön</string>
   <string name="color_blue_title">Blå</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Bildjustering</string>
+  <string name="adj_hue_title">Nyans</string>
+  <string name="adj_saturation_title">Mättnad</string>
   <string name="adj_intensity_title">Intensitet</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Button settings -->
   <string name="button_pref_title">Knappar</string>
+  <string name="hardware_keys_power_key_title">Avstängningsknapp</string>
+  <string name="hardware_keys_home_key_title">Hemknapp</string>
+  <string name="hardware_keys_back_key_title">Bakåtknapp</string>
   <string name="hardware_keys_menu_key_title">Menyknapp</string>
   <string name="hardware_keys_assist_key_title">Sökknapp</string>
   <string name="hardware_keys_camera_key_title">Kameraknapp</string>
@@ -107,16 +132,25 @@
   <string name="hardware_keys_action_launch_camera">Öppna kamera</string>
   <string name="hardware_keys_action_sleep">Stäng av skärmen</string>
   <string name="hardware_keys_action_split_screen">Delad skärm</string>
+  <string name="camera_launch_title">Starta kamera</string>
+  <string name="volbtn_cursor_control_off">Inaktiverad</string>
   <string name="power_end_call_title">Avsluta samtal</string>
+  <string name="extras_title">Extra</string>
+  <string name="additional_buttons_title">Fler knappar</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">Bakgrundsbelysning</string>
   <string name="keyboard_backlight_seekbar_title">Tangetbordsljusstyrka</string>
+  <string name="backlight_timeout_unlimited">Stäng inte av</string>
   <string name="backlight_summary_disabled">Avaktiverad</string>
   <string name="backlight_summary_enabled">Aktiverad</string>
   <!-- Buttons - Enable navbar -->
   <!-- Navigation Bar -->
   <!-- Power menu -->
+  <string name="power_menu_title">Avstängningsmeny</string>
   <string name="power_menu_airplane_title">Flygplansläge</string>
+  <string name="power_menu_bug_report_title">Buggrapport</string>
   <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <string name="torch_long_press_power_timeout_never">Aldrig</string>
   <!-- Profiles -->
   <string name="profile_tabs_wifi">Wi\u2011Fi</string>
   <string name="profile_tabs_bluetooth">Bluetooth</string>
@@ -134,13 +168,17 @@
   <string name="profile_selected">Vald profil: %1$s</string>
   <string name="profile_unknown_nfc_tag">Okänd profil</string>
   <string name="profile_select">Välj profil</string>
+  <string name="profile_remove_dialog_message">Ta bort profilen %1$s?</string>
+  <string name="profile_app_group_item_instructions">Lägg till eller ta bort grupper</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">På</string>
   <string name="profile_entries_off">Av</string>
   <!-- Add Profile -->
   <string name="profile_name_title">Namn</string>
+  <string name="new_profile_name">&lt;ny profil&gt;</string>
   <!-- Rename Dialog  -->
   <string name="rename_dialog_title">Byt namn</string>
+  <string name="rename_dialog_message">Fyll i ett nytt namn</string>
   <string name="rename_dialog_hint">Ange profilnamn</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Återställ</string>
@@ -164,7 +202,9 @@
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">Appgrupper</string>
+  <string name="profile_applist_title">Appar</string>
   <string name="profile_new_appgroup">Ny app-grupp</string>
+  <string name="profile_delete_appgroup">Ta bort den här app-gruppen?</string>
   <string name="profile_appgroup_name_title">Namn</string>
   <!-- Add application dialog box title -->
   <string name="profile_choose_app">Välj app</string>
@@ -188,6 +228,8 @@
   <string name="doze_title">Omgivningsskärm</string>
   <!-- Status bar -->
   <string name="status_bar_title">Statusfält</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Vänster</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Höger</string>
   <string name="status_bar_quick_qs_pulldown_off">Av</string>
   <string name="status_bar_quick_qs_pulldown_left">Vänster</string>
   <string name="status_bar_quick_qs_pulldown_right">Höger</string>
@@ -212,11 +254,16 @@
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statusfältsikoner</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_units_kilobits">Kilobits per sekund (kb/s)</string>
   <!-- Protected apps -->
+  <string name="protected_apps_manager_title">Skyddade appar</string>
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">LineageOS statistik</string>
+  <string name="anonymous_statistics_warning_title">Om</string>
+  <string name="view_stats_title">Visa statistik</string>
   <!-- Anonymous Statistics - Preview -->
   <string name="preview_id_title">Unikt ID</string>
   <string name="preview_device_title">Enhet</string>
@@ -224,6 +271,7 @@
   <string name="preview_country_title">Land</string>
   <string name="preview_carrier_title">Operatör</string>
   <!-- Display : Rotation  -->
+  <string name="accelerometer_title">Rotera skärmen automatiskt</string>
   <string name="display_rotation_unit">grader</string>
   <string name="display_rotation_0_title">0 grader</string>
   <string name="display_rotation_90_title">90 grader</string>
@@ -239,9 +287,16 @@
   <string name="weather_settings_keyword">väder</string>
   <string name="status_bar_show_weather_title">Visa väder</string>
   <!-- Power: Performance profiles -->
+  <string name="auto_power_save_never">Aldrig</string>
   <!-- Applications: Expanded desktop -->
+  <string name="expanded_desktop_settings_title">Utökat skrivbord</string>
+  <string name="expanded_desktop_style_hide_status">Dölj statusfält</string>
+  <string name="expanded_desktop_style_hide_navigation">Dölj navigeringsfält</string>
+  <string name="expanded_desktop_style_hide_both">Dölj båda</string>
   <!-- Sounds: Charging sounds -->
   <string name="charging_sounds_enabled_title">Aktivera</string>
+  <string name="power_notifications_vibrate_title">Vibrera</string>
+  <string name="charging_sounds_ringtone_title">Aviseringsljud</string>
   <string name="charging_sounds_ringtone_silent">Tyst</string>
   <!-- Gestures: Touchscreen gestures -->
   <string name="touchscreen_gesture_up_arrow_title">Rita ett \"Λ\"</string>
@@ -262,4 +317,6 @@
   <string name="touchscreen_gesture_action_browser">Öppna webbläsaren</string>
   <string name="touchscreen_gesture_action_email">Visa dina e-postmeddelanden</string>
   <string name="touchscreen_gesture_action_messages">Visa dina meddelanden</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ta-rIN/plurals.xml b/res/values-ta/plurals.xml
similarity index 100%
rename from res/values-ta-rIN/plurals.xml
rename to res/values-ta/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ta/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ta/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-te-rIN/plurals.xml b/res/values-te/plurals.xml
similarity index 100%
rename from res/values-te-rIN/plurals.xml
rename to res/values-te/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-te/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-te/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-te/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ta-rIN/plurals.xml b/res/values-tl/plurals.xml
similarity index 100%
copy from res/values-ta-rIN/plurals.xml
copy to res/values-tl/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-tl/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-tl/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index de452a5..f37b6da 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">Ara</string>
   <string name="disabled">Devre dışı</string>
   <string name="enabled">Etkin</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Gizlilik</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Normal</string>
   <string name="pulse_speed_slow">Yavaş</string>
   <string name="pulse_speed_very_slow">Çok yavaş</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Parlaklık seviyesi</string>
+  <string name="light_brightness_normal">Normal</string>
+  <string name="light_brightness_zen">Rahatsız Etmeyin</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Pil ışığı</string>
   <string name="battery_low_pulse_title">Pil zayıfsa yanıp sön</string>
@@ -194,8 +199,10 @@
   <string name="volume_answer_call_summary">Ses düğmelerine basarak gelen aramaları cevapla</string>
   <string name="home_answer_call_title">Aramaya cevap ver</string>
   <string name="home_answer_call_summary">Gelen aramaları ana ekran tuşuna basarak cevaplayın</string>
+  <string name="extras_title">Ekstralar</string>
+  <string name="additional_buttons_title">Ek tuşlar</string>
   <!-- Key backlight -->
-  <string name="button_backlight_title">Arka aydınlatma</string>
+  <string name="button_backlight_title">Aydınlatma ışığı</string>
   <string name="button_backlight_enabled">Tuşları aydınlat</string>
   <string name="keyboard_backlight_enabled">Klavyeyi aydınlat</string>
   <string name="button_backlight_seekbar_title">Tuş parlaklığı</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Yazı yazarken sağ ve sol imleç tuşlarını göster. Klavye değiştiriciyi gösterme.</string>
   <string name="navigation_bar_home_long_press_title">Ana ekran tuşuna uzun basma eylemi</string>
   <string name="navigation_bar_home_double_tap_title">Ana ekran tuşuna çift dokunma eylemi</string>
+  <string name="navigation_bar_app_switch_long_press_title">Son uygulamalar tuşuna uzun basma eylemi</string>
   <!-- Power menu -->
   <string name="power_menu_title">Güç menüsü</string>
-  <string name="power_menu_reboot_title">Yeniden başlat menüsü</string>
   <string name="power_menu_screenshot_title">Ekran görüntüsü</string>
+  <string name="power_menu_screenshot_summary">Kısmi ekran görüntüsü için basılı tutun</string>
   <string name="power_menu_airplane_title">Uçak modu</string>
   <string name="power_menu_users_title">Kullanıcı değiştir</string>
-  <string name="power_menu_settings_title">Ayarlar kısayolu</string>
-  <string name="power_menu_lockdown_title">Cihazı kilitle</string>
   <string name="power_menu_bug_report_title">Hata raporu</string>
-  <string name="power_menu_sound_title">Ses paneli</string>
   <string name="power_menu_bug_report_disabled">Hata raporlama geliştirici ayarlarında devre dışı bırakıldı</string>
   <string name="volume_keys_control_ring_stream_title">Zil sesi düzeyini kontrol et</string>
   <string name="volume_keys_control_ring_stream_summary_on">Ses tuşları zil sesi düzeyini kontrol eder</string>
@@ -386,7 +391,7 @@
   <string name="status_bar_quick_qs_pulldown_off">Kapalı</string>
   <string name="status_bar_quick_qs_pulldown_left">Sol</string>
   <string name="status_bar_quick_qs_pulldown_right">Sağ</string>
-  <string name="status_bar_double_tap_to_sleep_title">Uyku için çift dokunun</string>
+  <string name="status_bar_double_tap_to_sleep_title">Uykutmak için çift dokunun</string>
   <string name="status_bar_double_tap_to_sleep_summary">Ekranı kapatmak için durum çubuğuna çift dokunun</string>
   <!-- Status bar - icons -->
   <string name="status_bar_icons_title">Durum çubuğu simgeleri</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Durum çubuğu simgeleri</string>
   <string name="status_bar_icons_summary">Gösterilen durum çubuğu simgelerini kontrol et</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Ağ trafik göstergesi</string>
+  <string name="network_traffic_settings_summary">Durum çubuğunda geçerli ağ trafiği düzeylerini göster</string>
+  <string name="network_traffic_mode_title">Görüntü modu</string>
+  <string name="network_traffic_mode_disable">Devre dışı</string>
+  <string name="network_traffic_mode_up">Yalnızca yükleme</string>
+  <string name="network_traffic_mode_down">Yalnızca indirme</string>
+  <string name="network_traffic_mode_all">Yükleme ve İndirme</string>
+  <string name="network_traffic_autohide">Otomatik gizle</string>
+  <string name="network_traffic_autohide_summary">Hiçbir etkinlik olmadığında ağ trafiği göstergesini gizle</string>
+  <string name="network_traffic_units_title">Trafik ölçme birimleri</string>
+  <string name="network_traffic_units_kilobits">Saniyede kilobit (kb/s)</string>
+  <string name="network_traffic_units_megabits">Saniyede megabit (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Saniyede kilobayt (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Saniyede megabayt (MB/sn)</string>
+  <string name="network_traffic_show_units">Birimleri göster</string>
+  <string name="network_traffic_show_units_summary">Durum çubuğunda trafik ölçüm birimlerinin gösterilip gösterilmeyeceği</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Korunan uygulamalar</string>
   <string name="protected_apps_manager_summary">Güvenli kilitlemenin arkasında hangi uygulamaların gizlendiğini yönetin</string>
@@ -449,9 +471,11 @@
   <!-- Anonymous Statistics #Lineage -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">LineageOS istatistikleri</string>
-  <string name="anonymous_statistics_summary">LineageOS\'u geliştirmeye yardım etmek için anonim istatistik göndermeyi kabul edin</string>
+  <string name="anonymous_statistics_summary">Anonim istatistik raporlamayı tercih ederek LineageOS\'u daha iyi hale getirmeye yardımcı olun</string>
   <string name="anonymous_statistics_warning_title">Hakkında</string>
-  <string name="anonymous_statistics_warning">LineageOS İstatistiklerine dahil olmak kişisel olmayan verilerin LineageOS geliştiricilerine cihazlar arasındaki benzersiz yüklemeleri takip etmeleri için gönderilmesine izin verir. Bu bilgi, kişisel bilgi içermeyen ve gizliliğinizi tehdit etmeyen bir benzersiz numara da içerir. Veri her başlangıçta gönderilir.\n\nGönderilecek verinin örneğini görmek için Veriyi Önizle butonunu kullanın.</string>
+  <string name="anonymous_statistics_warning">LineageOS İstatistiklerine dahil olmak, cihazlar arasındaki benzersiz yüklemeleri izlemek için
+        LineageOS geliştiricilerine kişisel olmayan verilerin gönderilmesine izin verecektir. Gönderilen bilgiler, gizliliğinizi veya
+        kişisel verilerinizi tehlikeye atmayan benzersiz bir tanımlayıcıyı içerir. Veriler her önyükleme sırasında gönderilir.\n\nGönderilen verilere bir örnek için Verileri Önizle üzerine dokunun.</string>
   <string name="enable_reporting_title">Raporlamayı etkinleştir</string>
   <string name="preview_data_title">Veriyi önizle</string>
   <string name="view_stats_title">İstatistikleri görüntüle</string>
@@ -502,7 +526,7 @@
   <string name="power_save_title">Yüksek pil tasarrufu</string>
   <string name="power_save_summary">Güç tasarrufu için cihaz performansını ve arka plan etkinliğini kısıtla</string>
   <string name="auto_power_save_title">Otomatik pil tasarrufu</string>
-  <string name="auto_power_save_summary_on">Pil %s olduğunda pil tasarruf modunu otomatik olarak etkinleştir</string>
+  <string name="auto_power_save_summary_on">Pil %s olduğunda güç tasarrufu modunu otomatik olarak etkinleştir</string>
   <string name="auto_power_save_summary_off">Pil tasarrufu modunu otomatik olarak etkinleştirme</string>
   <string name="auto_power_save_never">Asla</string>
   <!-- Applications: Expanded desktop -->
@@ -545,6 +569,11 @@
   <string name="touchscreen_gesture_letter_w_title">\"W\" harfi çizin</string>
   <string name="touchscreen_gesture_letter_z_title">\"Z\" harfi çizin</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Kalemle yukarı kaydır</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Kalemle aşağı kaydır</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Kalemle sola kaydır</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Kalemle sağa kaydır</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Kalemle uzun bas</string>
   <string name="touchscreen_gesture_action_dialog_title">Hareket eylemi</string>
   <string name="touchscreen_gesture_action_do_nothing">Hiçbir şey yapma</string>
   <string name="touchscreen_gesture_action_flashlight">El fenerini aç/kapat</string>
@@ -556,4 +585,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Müziği oynat/duraklat</string>
   <string name="touchscreen_gesture_action_previous_track">Önceki şarkıya dön</string>
   <string name="touchscreen_gesture_action_next_track">Sonraki şarkıya geç</string>
+  <string name="touchscreen_gesture_action_volume_down">Medya sesini azalt</string>
+  <string name="touchscreen_gesture_action_volume_up">Medya sesini yükselt</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 77fb813..3d95112 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,6 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Налаштування LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Завантаження\u2026</string>
   <string name="dlg_ok">ОК</string>
@@ -38,6 +37,7 @@
   <string name="search">Пошук</string>
   <string name="disabled">Вимкнено</string>
   <string name="enabled">Увімкнено</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Конфіденційність</string>
   <!-- Privacy Guard -->
@@ -75,6 +75,7 @@
   <string name="pulse_speed_normal">Нормальний</string>
   <string name="pulse_speed_slow">Повільно</string>
   <string name="pulse_speed_very_slow">Дуже повільно</string>
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <string name="battery_light_title">Індикація батареї</string>
   <string name="battery_low_pulse_title">Блимати при розрядженій батареї</string>
@@ -218,14 +219,10 @@
   <string name="navigation_bar_home_double_tap_title">Дія при подвійному натисканні на кнопку \"Додому\"</string>
   <!-- Power menu -->
   <string name="power_menu_title">Меню кнопки живлення</string>
-  <string name="power_menu_reboot_title">Меню перезавантаження</string>
   <string name="power_menu_screenshot_title">Скріншот</string>
   <string name="power_menu_airplane_title">Режим польоту</string>
   <string name="power_menu_users_title">Перемикання користувачів</string>
-  <string name="power_menu_settings_title">Ярлик налаштувань</string>
-  <string name="power_menu_lockdown_title">Блокування пристрою</string>
   <string name="power_menu_bug_report_title">Звіт про помилку</string>
-  <string name="power_menu_sound_title">Звукова панель</string>
   <string name="power_menu_bug_report_disabled">Надсилання звітів про помилки вимкнено в налаштуваннях розробника</string>
   <string name="volume_keys_control_ring_stream_title">Регулювання гучності рингтону</string>
   <string name="volume_keys_control_ring_stream_summary_on">Клавіші регулювання гучності контролюють гучність дзвінка</string>
@@ -429,6 +426,7 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Значки в рядку стану</string>
   <string name="status_bar_icons_summary">Керування відображенням піктограм в панелі стану</string>
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Захищені додатки</string>
   <string name="protected_apps_manager_summary">Керування додатками, для запуску яких потрібно ввести пароль</string>
@@ -556,4 +554,6 @@
   <string name="touchscreen_gesture_action_play_pause_music">Відтворити або призупинити відтворення музики</string>
   <string name="touchscreen_gesture_action_previous_track">Перейти до попереднього музичного треку</string>
   <string name="touchscreen_gesture_action_next_track">Перехід до наступного музичного треку</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-ur-rPK/plurals.xml b/res/values-ur/plurals.xml
similarity index 100%
rename from res/values-ur-rPK/plurals.xml
rename to res/values-ur/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-ur/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-ur/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index 1623acb..0000000
--- a/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--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.
-	You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR 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">
-  <!-- Generic stuff used everywhere -->
-  <!-- Privacy Settings Header item -->
-  <!-- Privacy Guard -->
-  <!-- Notification light dialogs -->
-  <!-- Values for the notification light pulse spinners -->
-  <!-- Battery light settings -->
-  <!-- Lights settings screen, notification light settings -->
-  <!-- Lights settings, LED notification -->
-  <!-- LiveDisplay -->
-  <!-- LiveDisplay : Picture Adjustment -->
-  <!-- Button settings -->
-  <!-- Key backlight -->
-  <!-- Buttons - Enable navbar -->
-  <!-- Navigation Bar -->
-  <!-- Power menu -->
-  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-  <!-- Profiles -->
-  <!-- Profile triggers -->
-  <!-- Profiles settings  -->
-  <!-- Profile mode options. -->
-  <!-- Add Profile -->
-  <!-- Rename Dialog  -->
-  <!-- Reset Profiles -->
-  <!-- Delete confimation messages -->
-  <!-- Profile network mode -->
-  <!-- Profile Config screen PreferenceGroup titles -->
-  <!-- Menu item for managing profiles -->
-  <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <!-- Profile Settings sound modes labels -->
-  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <!-- Title for application group setting screen -->
-  <!-- Add application dialog box title -->
-  <!-- Profiles - system settings -->
-  <!-- Connection override toggles (not all are used at this time ) -->
-  <!-- Sound settings screen -->
-  <!-- Status bar -->
-  <!-- Status bar - icons -->
-  <!-- Status bar - Clock -->
-  <!-- Status bar - Battery -->
-  <!-- Status bar - Battery percentage -->
-  <!-- Status bar - Brightness -->
-  <!-- Status bar - icon blacklist -->
-  <!-- Protected apps -->
-  <!-- Contributors cloud activity -->
-  <!-- Anonymous Statistics #Lineage -->
-  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <!-- Anonymous Statistics - Preview -->
-  <!-- Display : Rotation  -->
-  <!-- Weather -->
-  <!-- Power: Performance profiles -->
-  <!-- Applications: Expanded desktop -->
-  <!-- Sounds: Charging sounds -->
-  <!-- Gestures: Touchscreen gestures -->
-  <!-- Gesture: Stylus gestures -->
-</resources>
diff --git a/res/values-uz-rUZ/plurals.xml b/res/values-uz/plurals.xml
similarity index 100%
rename from res/values-uz-rUZ/plurals.xml
rename to res/values-uz/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-uz/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-uz/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-az-rAZ/plurals.xml b/res/values-vec/plurals.xml
similarity index 100%
copy from res/values-az-rAZ/plurals.xml
copy to res/values-vec/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-vec/strings.xml
similarity index 91%
copy from res/values-az-rAZ/strings.xml
copy to res/values-vec/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-vec/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5b6f5f4..0e51d32 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -17,7 +17,7 @@
 	limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lineageparts_title">Cài đặt LineageOS</string>
+  <string name="lineageparts_title">Cài Đặt LineageOS</string>
   <!-- Generic stuff used everywhere -->
   <string name="loading">Đang tải\u2026</string>
   <string name="dlg_ok">OK</string>
@@ -38,6 +38,7 @@
   <string name="search">Tìm kiếm</string>
   <string name="disabled">Đã tắt</string>
   <string name="enabled">Đã bật</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">Quyền riêng tư</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">Bình thường</string>
   <string name="pulse_speed_slow">Chậm</string>
   <string name="pulse_speed_very_slow">Rất chậm</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">Độ sáng</string>
+  <string name="light_brightness_normal">Bình thường</string>
+  <string name="light_brightness_zen">Đừng Làm Phiền</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">Đèn báo pin</string>
   <string name="battery_low_pulse_title">Nhấp nháy khi pin yếu</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">Trả lời cuộc gọi đến bằng cách nhấn nút âm lượng</string>
   <string name="home_answer_call_title">Trả lời cuộc gọi</string>
   <string name="home_answer_call_summary">Trả lời cuộc gọi đến bằng cách nhấn nút trang chính</string>
+  <string name="extras_title">Tiện ích</string>
+  <string name="additional_buttons_title">Nút bổ sung</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Đèn nền</string>
   <string name="button_backlight_enabled">Phát sáng các phím</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">Hiển thị các nút con trỏ bên trái và bên phải khi nhập liệu. Ghi đè bộ chuyển IME.</string>
   <string name="navigation_bar_home_long_press_title">Hành động khi nhấn giữ phím Trang chính</string>
   <string name="navigation_bar_home_double_tap_title">Hành động nhấn phím Trang chính hai lần</string>
+  <string name="navigation_bar_app_switch_long_press_title">Thao tác nhấn giữ phím gần đây</string>
   <!-- Power menu -->
   <string name="power_menu_title">Trình đơn nguồn</string>
-  <string name="power_menu_reboot_title">Trình đơn khởi động lại</string>
   <string name="power_menu_screenshot_title">Chụp ảnh màn hình</string>
+  <string name="power_menu_screenshot_summary">Nhấn giữ để chụp ảnh màn hình một phần</string>
   <string name="power_menu_airplane_title">Chế độ máy bay</string>
   <string name="power_menu_users_title">Chuyển người dùng</string>
-  <string name="power_menu_settings_title">Lối tắt cài đặt</string>
-  <string name="power_menu_lockdown_title">Khoá cứng thiết bị</string>
   <string name="power_menu_bug_report_title">Báo cáo lỗi</string>
-  <string name="power_menu_sound_title">Bảng điều khiển âm thanh</string>
   <string name="power_menu_bug_report_disabled">Báo cáo lỗi bị tắt trong cài đặt nhà phát triển</string>
   <string name="volume_keys_control_ring_stream_title">Điều khiển âm lượng nhạc chuông</string>
   <string name="volume_keys_control_ring_stream_summary_on">Phím âm lượng điều khiển âm lượng nhạc chuông</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Biểu tượng thanh trạng thái</string>
   <string name="status_bar_icons_summary">Kiểm soát những biểu tượng thanh trang thái được hiển thị</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">Giám sát lưu lượng mạng</string>
+  <string name="network_traffic_settings_summary">Hiển thị mức lưu lượng mạng hiện tại trên thanh trạng thái</string>
+  <string name="network_traffic_mode_title">Chế độ hiển thị</string>
+  <string name="network_traffic_mode_disable">Tắt</string>
+  <string name="network_traffic_mode_up">Chỉ tải lên</string>
+  <string name="network_traffic_mode_down">Chỉ tải xuống</string>
+  <string name="network_traffic_mode_all">Tải lên và tải xuống</string>
+  <string name="network_traffic_autohide">Tự động ẩn</string>
+  <string name="network_traffic_autohide_summary">Ẩn giám sát lưu lượng mạng khi không có hoạt động</string>
+  <string name="network_traffic_units_title">Đơn vị đo lưu lượng</string>
+  <string name="network_traffic_units_kilobits">Kilobit mỗi giây (kb/s)</string>
+  <string name="network_traffic_units_megabits">Megabit mỗi giây (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">Kilobyte mỗi giây (kB/s)</string>
+  <string name="network_traffic_units_megabytes">Megabit mỗi giây (Mb/s)</string>
+  <string name="network_traffic_show_units">Hiển thị các đơn vị</string>
+  <string name="network_traffic_show_units_summary">Hiển thị các đơn vị đo lưu lượng truy cập trong thanh trạng thái</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">Các ứng dụng được bảo vệ</string>
   <string name="protected_apps_manager_summary">Quản lý các ứng dụng được ẩn sau khóa an toàn</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">Vẽ chữ cái \"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">Vẽ chữ cái \"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">Trượt lên với bút stylus</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">Trượt xuống với bút stylus</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">Trượt bên trái với bút stylus</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">Trượt bên phải ở với bút stylus</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">Nhấn giữ với bút stylus</string>
   <string name="touchscreen_gesture_action_dialog_title">Hành động cử chỉ</string>
   <string name="touchscreen_gesture_action_do_nothing">Không làm gì</string>
   <string name="touchscreen_gesture_action_flashlight">Bật/tắt đèn pin</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">Phát/tạm dừng nhạc</string>
   <string name="touchscreen_gesture_action_previous_track">Chuyển đến bài kế tiếp</string>
   <string name="touchscreen_gesture_action_next_track">Bỏ qua bài kế tiếp</string>
+  <string name="touchscreen_gesture_action_volume_down">Âm lượng phương tiện thấp hơn</string>
+  <string name="touchscreen_gesture_action_volume_up">Âm lượng phương tiện cao hơn</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1f26b07..fb93ee1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">搜索</string>
   <string name="disabled">已禁用</string>
   <string name="enabled">已启用</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">隐私</string>
   <!-- Privacy Guard -->
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">正常</string>
   <string name="pulse_speed_slow">较慢</string>
   <string name="pulse_speed_very_slow">非常慢</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">亮度级别</string>
+  <string name="light_brightness_normal">正常</string>
+  <string name="light_brightness_zen">勿扰</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">电量指示灯</string>
   <string name="battery_low_pulse_title">电量低时开启呼吸灯</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">按音量键接听来电</string>
   <string name="home_answer_call_title">接听电话</string>
   <string name="home_answer_call_summary">按 Home 键接听来电</string>
+  <string name="extras_title">附加功能</string>
+  <string name="additional_buttons_title">附加按钮</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">背光</string>
   <string name="button_backlight_enabled">点亮按键</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">键入时显示左右光标按钮而不显示输入法选择器。</string>
   <string name="navigation_bar_home_long_press_title">Home 键的长按操作</string>
   <string name="navigation_bar_home_double_tap_title">Home 键双击行为</string>
+  <string name="navigation_bar_app_switch_long_press_title">最近应用键的长按操作</string>
   <!-- Power menu -->
   <string name="power_menu_title">电源菜单</string>
-  <string name="power_menu_reboot_title">重启菜单</string>
   <string name="power_menu_screenshot_title">屏幕截图</string>
+  <string name="power_menu_screenshot_summary">长按以进行局部截图</string>
   <string name="power_menu_airplane_title">飞行模式</string>
   <string name="power_menu_users_title">用户切换器</string>
-  <string name="power_menu_settings_title">设置快捷方式</string>
-  <string name="power_menu_lockdown_title">锁定设备</string>
   <string name="power_menu_bug_report_title">错误报告</string>
-  <string name="power_menu_sound_title">声音面板</string>
   <string name="power_menu_bug_report_disabled">开发者选项中已禁用错误报告</string>
   <string name="volume_keys_control_ring_stream_title">控制铃声音量</string>
   <string name="volume_keys_control_ring_stream_summary_on">使用音量键控制铃声音量</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">状态栏图标</string>
   <string name="status_bar_icons_summary">控制显示哪些状态栏图标</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">网络流量监视</string>
+  <string name="network_traffic_settings_summary">在状态栏中显示当前的网络流量级别</string>
+  <string name="network_traffic_mode_title">显示模式</string>
+  <string name="network_traffic_mode_disable">禁用</string>
+  <string name="network_traffic_mode_up">仅上载</string>
+  <string name="network_traffic_mode_down">仅下载</string>
+  <string name="network_traffic_mode_all">上载和下载</string>
+  <string name="network_traffic_autohide">自动隐藏</string>
+  <string name="network_traffic_autohide_summary">在网络不活跃时隐藏状态栏网速</string>
+  <string name="network_traffic_units_title">网络流量单位</string>
+  <string name="network_traffic_units_kilobits">千比特每秒 (kb/s)</string>
+  <string name="network_traffic_units_megabits">兆比特每秒 (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">千字节每秒 (kB/s)</string>
+  <string name="network_traffic_units_megabytes">兆字节每秒 (MB/s)</string>
+  <string name="network_traffic_show_units">显示单位</string>
+  <string name="network_traffic_show_units_summary">是否在状态栏显示当前网速</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">受保护的应用</string>
   <string name="protected_apps_manager_summary">管理安全锁隐藏的应用</string>
@@ -545,6 +567,11 @@
   <string name="touchscreen_gesture_letter_w_title">绘制字母\"W\"</string>
   <string name="touchscreen_gesture_letter_z_title">绘制字母\"Z\"</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">用手写笔向上滑动</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">用手写笔向下滑动</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">用手写笔向左滑动</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">用手写笔向右滑动</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">用手写笔进行长按</string>
   <string name="touchscreen_gesture_action_dialog_title">手势操作</string>
   <string name="touchscreen_gesture_action_do_nothing">不进行任何操作</string>
   <string name="touchscreen_gesture_action_flashlight">切换手电筒</string>
@@ -556,4 +583,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">播放/暂停音乐播放</string>
   <string name="touchscreen_gesture_action_previous_track">转到上一曲目</string>
   <string name="touchscreen_gesture_action_next_track">转到下一曲目</string>
+  <string name="touchscreen_gesture_action_volume_down">降低媒体音量</string>
+  <string name="touchscreen_gesture_action_volume_up">提高媒体音量</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a652835..e8efea5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -38,6 +38,7 @@
   <string name="search">搜尋</string>
   <string name="disabled">已停用</string>
   <string name="enabled">已啟用</string>
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_title">隱私權</string>
   <!-- Privacy Guard -->
@@ -61,7 +62,7 @@
   <string name="default_time">正常</string>
   <string name="custom_time">自訂</string>
   <string name="dialog_delete_title">刪除</string>
-  <string name="dialog_delete_message">移除已選取的項目？</string>
+  <string name="dialog_delete_message">移除已選擇的項目？</string>
   <string name="brightness">亮度級別</string>
   <!-- Values for the notification light pulse spinners -->
   <string name="pulse_length_always_on">一律開啟</string>
@@ -75,6 +76,10 @@
   <string name="pulse_speed_normal">正常</string>
   <string name="pulse_speed_slow">慢</string>
   <string name="pulse_speed_very_slow">非常低</string>
+  <!-- Common light settings strings -->
+  <string name="light_brightness_title">亮度級別</string>
+  <string name="light_brightness_normal">一般</string>
+  <string name="light_brightness_zen">勿干擾模式</string>
   <!-- Battery light settings -->
   <string name="battery_light_title">電量指示燈</string>
   <string name="battery_low_pulse_title">電量不足時閃爍呼吸燈</string>
@@ -194,6 +199,8 @@
   <string name="volume_answer_call_summary">按音量鍵接聽來電</string>
   <string name="home_answer_call_title">接聽電話</string>
   <string name="home_answer_call_summary">按主畫面鍵接聽來電</string>
+  <string name="extras_title">附加功能</string>
+  <string name="additional_buttons_title">附加按鍵</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">背光</string>
   <string name="button_backlight_enabled">開啟按鍵背光</string>
@@ -216,16 +223,14 @@
   <string name="navigation_bar_arrow_keys_summary">輸入時顯示游標鍵。取代輸入法切換器。</string>
   <string name="navigation_bar_home_long_press_title">主畫面鍵長按動作</string>
   <string name="navigation_bar_home_double_tap_title">主畫面輕觸兩下動作</string>
+  <string name="navigation_bar_app_switch_long_press_title">多工鍵長按動作</string>
   <!-- Power menu -->
   <string name="power_menu_title">電源選單</string>
-  <string name="power_menu_reboot_title">重新啟動選單</string>
   <string name="power_menu_screenshot_title">螢幕擷取</string>
+  <string name="power_menu_screenshot_summary">長按即可部分螢幕擷取</string>
   <string name="power_menu_airplane_title">飛航模式</string>
   <string name="power_menu_users_title">使用者切換器</string>
-  <string name="power_menu_settings_title">設定捷徑</string>
-  <string name="power_menu_lockdown_title">鎖定裝置</string>
   <string name="power_menu_bug_report_title">錯誤報告</string>
-  <string name="power_menu_sound_title">音效面板</string>
   <string name="power_menu_bug_report_disabled">已在開發人員選項中停用錯誤報告</string>
   <string name="volume_keys_control_ring_stream_title">控制鈴聲音量</string>
   <string name="volume_keys_control_ring_stream_summary_on">音量鍵控制鈴聲音量</string>
@@ -277,8 +282,8 @@
   <string name="profile_write_touch_tag">觸碰標籤即可寫入</string>
   <string name="profile_write_success">標籤寫入成功</string>
   <string name="profile_write_failed">標籤寫入失敗！</string>
-  <string name="profile_selected">已選取的設定檔：%1$s</string>
-  <string name="profile_nfc_text">將設定檔寫入至 NFC 標籤允許透過輕觸標籤來選取此設定檔。再次輕觸將會回到之前選取的設定檔。</string>
+  <string name="profile_selected">已選擇的設定檔：%1$s</string>
+  <string name="profile_nfc_text">將設定檔寫入至 NFC 標籤允許透過輕觸標籤來選擇此設定檔。再次輕觸將會回到之前選擇的設定檔。</string>
   <string name="profile_unknown_nfc_tag">未知的設定檔</string>
   <string name="profile_add_nfc_text">此 NFC 標籤指向了一個未知的設定檔，連結此 NFC 標籤到現有的設定檔將允許您以後選取那個設定檔。</string>
   <string name="profile_select">選取設定檔</string>
@@ -429,6 +434,23 @@
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">狀態列圖示</string>
   <string name="status_bar_icons_summary">控制顯示哪些狀態列圖示</string>
+  <!-- Status bar - Network Traffic -->
+  <string name="network_traffic_settings_title">網路流量監測器</string>
+  <string name="network_traffic_settings_summary">在狀態列中顯示目前的網路級別</string>
+  <string name="network_traffic_mode_title">顯示模式</string>
+  <string name="network_traffic_mode_disable">已停用</string>
+  <string name="network_traffic_mode_up">僅限上傳</string>
+  <string name="network_traffic_mode_down">僅限下載</string>
+  <string name="network_traffic_mode_all">上傳和下載</string>
+  <string name="network_traffic_autohide">自動隱藏</string>
+  <string name="network_traffic_autohide_summary">沒有活動時隱藏流量監測器</string>
+  <string name="network_traffic_units_title">流量單位</string>
+  <string name="network_traffic_units_kilobits">每秒千位元組 (kb/s)</string>
+  <string name="network_traffic_units_megabits">每秒百萬位元組 (Mb/s)</string>
+  <string name="network_traffic_units_kilobytes">每秒千位元組 (kB/s)</string>
+  <string name="network_traffic_units_megabytes">每秒百位元組(MB/s)</string>
+  <string name="network_traffic_show_units">顯示單位</string>
+  <string name="network_traffic_show_units_summary">是否在狀態列中顯示流量單位</string>
   <!-- Protected apps -->
   <string name="protected_apps_manager_title">受保護的應用程式</string>
   <string name="protected_apps_manager_summary">管理安全鎖下隱藏的應用程式</string>
@@ -519,7 +541,7 @@
   <!-- Sounds: Charging sounds -->
   <string name="charging_sounds_settings_title">充電音效</string>
   <string name="charging_sounds_enabled_title">啟用</string>
-  <string name="charging_sounds_enabled_summary">接上或移除電源時播放音效</string>
+  <string name="charging_sounds_enabled_summary">接上或拔除電源時播放音效</string>
   <string name="power_notifications_vibrate_title">震動</string>
   <string name="charging_sounds_ringtone_title">通知音效</string>
   <string name="charging_sounds_ringtone_silent">靜音</string>
@@ -546,6 +568,11 @@
   <string name="touchscreen_gesture_letter_w_title">畫出一個字母「W」</string>
   <string name="touchscreen_gesture_letter_z_title">畫出一個字母「Z」</string>
   <!-- Gesture: Stylus gestures -->
+  <string name="touchscreen_gesture_swipe_up_stylus_title">用觸控筆向上滑動</string>
+  <string name="touchscreen_gesture_swipe_down_stylus_title">用觸控筆向下滑動</string>
+  <string name="touchscreen_gesture_swipe_left_stylus_title">用觸控筆向左滑動</string>
+  <string name="touchscreen_gesture_swipe_right_stylus_title">用觸控筆向右滑動</string>
+  <string name="touchscreen_gesture_long_press_stylus_title">用觸控筆長按</string>
   <string name="touchscreen_gesture_action_dialog_title">手勢動作</string>
   <string name="touchscreen_gesture_action_do_nothing">不執行任何動作</string>
   <string name="touchscreen_gesture_action_flashlight">切換至手電筒</string>
@@ -557,4 +584,8 @@
   <string name="touchscreen_gesture_action_play_pause_music">播放/暫停音樂播放</string>
   <string name="touchscreen_gesture_action_previous_track">導覽到上一首音樂曲目</string>
   <string name="touchscreen_gesture_action_next_track">跳到下一首音樂曲目</string>
+  <string name="touchscreen_gesture_action_volume_down">降低媒體音量</string>
+  <string name="touchscreen_gesture_action_volume_up">提高媒體音量</string>
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1623acb..e25297f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
 	Copyright (C) 2015 The CyanogenMod Project
-	          (C) 2017 The LineageOS Project
+	Copyright (C) 2017-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.
@@ -18,10 +18,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Generic stuff used everywhere -->
+  <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
   <!-- Privacy Settings Header item -->
   <!-- Privacy Guard -->
   <!-- Notification light dialogs -->
   <!-- Values for the notification light pulse spinners -->
+  <!-- Common light settings strings -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
   <!-- Lights settings, LED notification -->
@@ -59,6 +61,7 @@
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - Brightness -->
   <!-- Status bar - icon blacklist -->
+  <!-- Status bar - Network Traffic -->
   <!-- Protected apps -->
   <!-- Contributors cloud activity -->
   <!-- Anonymous Statistics #Lineage -->
@@ -71,4 +74,6 @@
   <!-- Sounds: Charging sounds -->
   <!-- Gestures: Touchscreen gestures -->
   <!-- Gesture: Stylus gestures -->
+  <!-- Egg: Title for the easter egg activity -->
+  <!-- Berry Lite -->
 </resources>