diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 6d3d6da..1fa5938 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -85,7 +85,8 @@
     <!-- right side: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
          android:layout_width="match_parent"
-         android:layout_height="match_parent" />
+         android:layout_height="match_parent"
+         android:background="@color/lock_pattern_background" />
 
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 87343c8..6e307b1 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -59,7 +59,8 @@
     <!-- right side: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
          android:layout_width="match_parent"
-         android:layout_height="match_parent" />
+         android:layout_height="match_parent"
+         android:background="@color/lock_pattern_background" />
 
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
index 8fa1cee..e0d9667 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -46,6 +46,7 @@
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
         android:layout_width="354dip"
         android:layout_height="354dip"
+        android:background="@color/lock_pattern_background"
         aspect="square"/>
 
     <View
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index b9dd27a..a090a6f 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -52,6 +52,7 @@
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
         android:layout_width="354dip"
         android:layout_height="354dip"
+        android:background="@color/lock_pattern_background"
         aspect="square"/>
 
     <View
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index dec8244..7733184 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -51,6 +51,7 @@
          android:layout_width="354dip"
          android:layout_height="354dip"
          android:layout_marginTop="80dip"
+         android:background="@color/lock_pattern_background"
          aspect="square"/>
 
     <View
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index c32422e..12e2b86 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -49,6 +49,7 @@
          android:layout_width="354dip"
          android:layout_height="354dip"
          android:layout_marginTop="80dip"
+         android:background="@color/lock_pattern_background"
          aspect="square"/>
 
     <View
diff --git a/res/layout/sms_preference_item.xml b/res/layout/app_preference_item.xml
similarity index 95%
rename from res/layout/sms_preference_item.xml
rename to res/layout/app_preference_item.xml
index 2146764..22ee37e 100755
--- a/res/layout/sms_preference_item.xml
+++ b/res/layout/app_preference_item.xml
@@ -21,13 +21,13 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:padding="6dip">
     <ImageView
-        android:id="@+id/sms_image"
+        android:id="@+id/app_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:padding="6dip"
     />
     <CheckedTextView
-        android:id="@+id/sms_text"
+        android:id="@+id/app_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index f932b4e..50f05d8 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -41,7 +41,8 @@
 
         <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
              android:layout_width="match_parent"
-             android:layout_height="match_parent" />
+             android:layout_height="match_parent"
+             android:background="@color/lock_pattern_background" />
 
         <!-- bottom line looks bad when button bar is their too, omit in this case -->
         <!--View
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index bd100d4..f11f5ae 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -34,7 +34,8 @@
 
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
          android:layout_width="match_parent"
-         android:layout_height="match_parent" />
+         android:layout_height="match_parent"
+         android:background="@color/lock_pattern_background" />
 
     <View
          android:background="@*android:drawable/code_lock_bottom"
diff --git a/res/layout/notification_app_section.xml b/res/layout/notification_app_section.xml
index 628b524..144ea11 100644
--- a/res/layout/notification_app_section.xml
+++ b/res/layout/notification_app_section.xml
@@ -15,5 +15,6 @@
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:attr/listSeparatorTextViewStyle"
+    android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
diff --git a/res/layout/preference_zen_mode.xml b/res/layout/preference_zen_mode.xml
deleted file mode 100644
index 4139d40..0000000
--- a/res/layout/preference_zen_mode.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/configure_zen_mode"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:padding="8dip"
-    android:visibility="gone"
-    android:background="?android:attr/selectableItemBackground"
-    android:src="@drawable/ic_bt_config"
-    android:contentDescription="@string/configure_zen_mode_description" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4efa306..44a4fdb 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datapogings:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-dienste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Swerwing:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Voer jou netwerkwagwoord in."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Verstek kennisgewingklank"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Kennisgewings hou jou op hoogte"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Belangrike kennisgewings sal opspring"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Spring op as hoë prioriteit"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Kennisgewing"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gebruik inkomendeoproep-volume vir kennisgewings"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Wys snitgrense, kantlyne, ens."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Dwing RTL-uitlegrigting"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Dwing skermuitlegrigting na RTL vir alle locales"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Laekragmodus"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktiveer batterybesparende instellings"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Wys CPU-verbruik"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skermlaag wys huidige CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forseer GPU-lewering"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Soek"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Soekinstellings"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi netwerk verbinding"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Wys wanneer gesluit"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Sensitiewe kennisgewinginhoud nie op sluitskerm"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Alle kennisgewinginhoud wys op die sluitskerm"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Beperkte onderbrekings"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Stel beperkte onderbrekings op"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Beperkte onderbrekings"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Wys op sluitskerm"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Tensy inhoud sensitief is"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Alle kennisgewings"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Moenie steur nie"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Moenie steur nie"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Kennisgewings"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Algemeen"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sekuriteit"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Aanpassings"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Programme"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Stel Wi-Fi-NFC-merker op"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik \'n merker om te skryf …"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Ongeldige wagwoord, probeer weer."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Sukses!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Kon nie data na NFC-merker skryf nie. As die probleem voortduur, probeer \'n ander merker"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-merker is nie skryfbaar nie. Gebruik asseblief \'n ander merker."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Verstekgeluid"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Wys kennisgewings"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hoë prioriteit"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klaar"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Wanneer aan, beperk onderbrekings tot"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Skakel outomaties vir slaap aan"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Foonoproepe"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Boodskappe"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Van"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Enigiemand"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Net kontakte"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Net gesterde kontakte"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Jy sal altyd wekkers en aftellers in Moenie steur nie hoor"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Wanneer"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nooit"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Elke nag"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Weekaande"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Begintyd"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindigtyd"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 855ebb1..ded4568 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ስፍራ:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"አጎራባችCID፡"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo፦"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"የውሂብ ሙከራዎች፡"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"የGPRS አገልግሎት፡"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"በመንቀሳቀስ ላይ:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"በ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"፣ በ<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ።"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"የለም"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።\n\nይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ነባሪ የማሳወቂያ ድምጽ"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"አሳዋቂ ማሳወቂያዎች"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"አስፈላጊ ማሳወቂያዎች ብቅ ይላሉ"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ከፍተኛ ትኩረት ያለው ከሆነ ብቅ አድርግ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ማሳወቂያ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ለማሳወቂያዎች የገቢ ጥሪ ድምፅን ተጠቀም"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"የቅንጥብ ገደቦች፣ ጠርዞች፣ ወዘተ አሳይ"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"የቀኝ-ወደ-ግራ አቀማመጥ አቅጣጫ አስገድድ"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ለሁሉም አካባቢዎች የማያ ገጽ አቀማመጥ ከቀኝ-ወደ-ግራ እንዲሆን አስገድድ"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"የCPU አጠቃቀም አሳይ"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም  እያሳየ ነው።"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU ምላሽ መስጠትን አስገድድ"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"ይፈልጉ"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"የፍለጋ ቅንብሮች"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"የwifi wi-fi አውታረ መረብ ግንኙነት"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"ሲቆለፍ አሳይ"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"ልዩ ጥንቃቄ የሚያስፈልጋቸው የማሳወቂያ ይዘቶች በመቆለፊያ ማያ ገጹ ላይ ይደበቃሉ"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"ሁሉም የማሳወቂያ ይዘቶች በመቆለፊያ ማያ ገጹ ላይ ይታያሉ"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"የተገደቡ ማቋረጦች"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"የተገደቡ መቋረጦችን አብጅ"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"የተገደቡ ማቋረጦች"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"በቁልፍ ማያ ገጽ ላይ አሳይ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"ይዘቱ ሚስጥራዊነት ያለው ከሆነ በስተቀር"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"ሁሉም ማሳወቂያዎች"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"አትረብሽ"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"አትረብሽ"</string>
     <string name="notification_settings" msgid="8342078884790733726">"ማሳወቂያዎች"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"አጠቃላይ"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"ደህንነት"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"ማስተካከያዎች"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"መተግበሪያዎች"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"የWiFi NFC መለያ ያዋቅሩ"</string>
+    <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"ለመጻፍ አንድ መለያ መታ ያድርጉ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"ልክ ያልሆነ የይለፍ ቃል፣ እንደገና ይሞክሩ።"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"ስኬት!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"ውሂብ በNFC መለያ ላይ መጻፍ አልተቻለም። ችግሩ ከቀጠለ የተለየ መለያ ይሞክሩ"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"የNFC መለያ ሊጻፍበት የሚችል አይደለም። እባክዎ የተለየ መለያ ይጠቀሙ።"</string>
+    <string name="default_sound" msgid="8821684447333687810">"ነባሪ ድምፅ"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"ማሳወቂያዎችን አሳይ"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"ከፍተኛ ቅድሚያ የሚሰጠው"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ተከናውኗል"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5573653..e5aa97a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"الموقع:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"‏تجاور CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"معلومات الخلية:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"محاولات البيانات:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"‏خدمة GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"تجوال:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"أدخل كلمة مرور الشبكة."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"لا شيء"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"سماح"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صوت الإشعار الافتراضي"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الاشعار بالنبض"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"تنبيه بالإشعارات"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"ستظهر إشعارات مهمّة"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"إشعار منبثق مع أولوية عالية"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"نغمة الرنين"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"التنبيه"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استخدام مستوى صوت المكالمة الواردة للإشعارات"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"عرض حدود وهوامش المقطع وما إلى ذلك."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"فرض اتجاه التنسيق ليكون من اليمين إلى اليسار"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"فرض اتجاه تنسيق الشاشة ليكون من اليمين إلى اليسار لجميع اللغات"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"وضع الطاقة المنخفضة"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"تمكين إعدادات توفير شحن البطارية"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"‏عرض استخدام CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"‏عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"‏فرض عرض رسومات GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"بحث"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"إعدادات البحث"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏اتصال شبكة واي فاي wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"عرض عند التأمين"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"سيتم إخفاء محتوى الإشعارات المهم في شاشة التأمين"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"سيتم عرض محتوى الإشعارات المهم في شاشة التأمين"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"انقطاعات محدودة"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"تهيئة الانقطاعات المحدودة"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"انقطاعات محدودة"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"تظهر على شاشة التأمين"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"ما لم يكن المحتوى مهمًا"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"جميع الإشعارات"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"الرجاء عدم الإزعاج"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"الرجاء عدم الإزعاج"</string>
     <string name="notification_settings" msgid="8342078884790733726">"الإشعارات"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"إعدادات عامة"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"الأمان"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"التعديلات"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"التطبيقات"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"‏علامة NFC لإعداد WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"انقر على كلمة علامة لكتابة..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"كلمة المرور غير صالحة، أعد المحاولة."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"نجح الإجراء!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"‏تعذرت كتابة البيانات إلى علامة NFC. إذا استمرت المشكلة، فجرّب علامة مختلفة."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"‏علامة NFC ليست قابلة للكتابة. الرجاء استخدام علامة مختلفة."</string>
+    <string name="default_sound" msgid="8821684447333687810">"الصوت الافتراضي"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"إظهار الإشعارات"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"أولوية عالية"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"تم"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"عند التشغيل، يجب ألا تزيد الانقطاعات عن"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"تشغيل وضع السكون تلقائيًا"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"مكالمات هاتفية"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"الرسائل"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"من"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"أي شخص"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"جهات الاتصال فقط"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"جهات الاتصال المميزة بنجمة فقط"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"ستستمع دائمًا إلى تنبيهات وموقتات في وضع الرجاء عدم الإزعاج"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"متى"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"مطلقًا"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"كل ليلة"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ليالي الأسبوع"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"وقت البدء"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"وقت الانتهاء"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 42a5906..5196458 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Идентификация на съседно обаждане:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Клетъчна информация:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Информация за DcRt:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Опити за данни:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Въведете паролата за мрежата."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен.\n\nИскате ли да разрешите това за всички приложения, които искат да сканират?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Стандартен звук за известяване"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсиране на светлината за известия"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Известия за внимание"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Важн. известия ще се показв. в изск. прозорец"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Изскачане при висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Известие"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Използване на силата на звука при вх. обаждане за известия"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показв. на границите на изрязване, полетата и др."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Принуд. оформл. отдясно наляво"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Принуд. оформл. на екрана отдясно наляво за вс. локали"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наслагване на екрана показва употр. на процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудително изобразяване"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Търсене"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Настройки за търсене"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"Връзка с WiFi/Wi-Fi мрежа"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Показване при закл. екран"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Поверит. съдържание ще е скрито при заключен екран"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Цялото съдържание ще се показва при заключен екран"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ограничени прекъсвания"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Конфигуриране на огран. прекъсвания"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ограничени прекъсвания"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Показване при закл. екран"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Освен ако съдържанието не е деликатно"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Всички известия"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Не ме безпокойте"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не ме безпокойте"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Известия"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Общи настройки"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Сигурност"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Фини настройки"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Приложения"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Настройване на маркер за КБП за WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Невалидна парола. Опитайте отново."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Успех!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Записването на данни в маркера за КБП не е възможно. Ако проблемът не се отстрани, опитайте с друг маркер"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Записването в маркера за КБП не е възможно. Моля, използвайте друг."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Стандартен звук"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Известия за приложенията"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Показване на известията"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Висок приоритет"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d0e6c55..e266c64 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informació mòbil:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Informació de diagnòstic:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intents de dades:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servei GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerància:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Escriu la contrasenya de la xarxa."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per millorar la precisió de la ubicació i per a altres finalitats, <xliff:g id="APP_NAME">%1$s</xliff:g> vol activar la cerca de xarxes tot i que la connexió Wi-Fi estigui desactivada.\n\nVols permetre-ho per a totes les aplicacions que vulguin cercar xarxes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"So de notificació predeterminat"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notificacions d\'avís"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Les notificacions importants seran emergents."</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Emergent amb prioritat alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"So de trucada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificació"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilitza el volum de trucada entrant per a les notificacions"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Força direcció dreta-esquerra"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Força direcció de pantalla dreta-esquerra en totes les llengües"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Mode de baix consum"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Activa la configuració d\'estalvi de bateria"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Cerca"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Configuració de la cerca"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"connexió xarxa wifi wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Mostra a pantalla bloq."</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Notificacions privades ocultes a pantalla bloqueig"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Les notificacions es mostraran a pantalla bloqueig"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interrupcions limitades"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Configura interrupcions limit."</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interrupcions limitades"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Mostra a pantalla bloq."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Tret que el contingut sigui confidencial."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Totes les notificacions"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"No molesteu"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molesteu"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notificacions"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"General"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Seguretat"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Retocs"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplicacions"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions de l\'aplicació"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configuració de l\'etiqueta NFC per a Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta per escriure..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"La contrasenya no és vàlida. Torna-ho a provar."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Procés correcte"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"No es poden escriure dades a l\'etiqueta NFC. Si el problema continua, prova-ho amb una altra etiqueta."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"No es pot escriure a l\'etiqueta NFC. Fes servir una altra etiqueta."</string>
+    <string name="default_sound" msgid="8821684447333687810">"So predeterminat"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificacions de l\'aplicació"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostra les notificacions"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioritat alta"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fet"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"En mode activat, limita interrupcions a"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Activa automàticament per al repòs"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Trucades"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Missatges"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"De"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualsevol usuari"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Només els contactes"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Només els contactes destacats"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"En mode No molesteu, sonaran alarmes i temporitzadors."</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Quan"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Cada nit"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Nits entre setmana"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora d\'inici"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalització"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2bb71fe..1250da9 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Informace:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy dat:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Zadejte heslo sítě."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi.\n\nChcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Výchozí zvuk oznámení"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Připravte se na oznámení"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Důležitá oznámení se zobrazí ve vysk. okně"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Prioritní ve vyskak. okně"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Oznámení"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobrazit u klipu ohraničení, okraje atd."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vynutit směr RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynutit ve všech jazycích směr rozvržení obrazovky RTL (zprava doleva)"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Překryvná vrstva s aktuálním využitím procesoru"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vykreslování pomocí GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Vyhledávání"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Vyhledávání nastavení"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi síť připojení"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Zobrazit při uzamčení"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Citlivý obsah oznámení bude na obrazovce uzamčení skryt"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Na obrazovce uzamčení se zobrazí veškerý obsah oznámení"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Omezený počet vyrušení"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Nastavení omezeného vyrušování"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Omezený počet vyrušování"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Zobr. na obraz. uzamčení"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Pouze obsah, který není citlivý"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Všechna oznámení"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Nerušit"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nerušit"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Oznámení"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Obecné"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Zabezpečení"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Vylepšení"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplikace"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení aplikací"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nastavení štítku NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na štítek zahájíte zápis..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Neplatné heslo, zkuste to znovu."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Povedlo se!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Zápis dat na štítek NFC se nezdařil. Pokud problém přetrvává, zkuste jiný štítek."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Na štítek NFC nelze zapisovat. Zkuste jiný štítek."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Výchozí zvuk"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Oznámení aplikací"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Zobrazit oznámení"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Vysoká priorita"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f2229e8..bb681d4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mobiloplysninger:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøg:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Indtast din adgangskode til netværket."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For bl.a. at kunne angive en mere nøjagtig placering vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardlyd for underretninger"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blink ved nye underretninger"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Forhåndsunderretninger"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Vigtige underretninger vises i pop op-vinduer"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop op, hvis høj prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Underretning"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Brug lydstyrke for indgående opkald til underretninger"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis grænser for klip, margener osv."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tving læsning mod venstre"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tving til højre mod venstre-layout for alle sprog"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Strømbesparelse"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Indstillinger for aktivering af strømbesparelse"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-forbrug"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skærmoverlejring viser det aktuelle CPU-forbrug"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Tving gengivelse af GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Søgning"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Indstillinger for søgning"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netværk forbindelse"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Vis ved låsning"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Følsomt indhold i underretninger bliver skjult på låseskærmen"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Alt indhold i underretninger bliver vist på låseskærmen"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Begrænsede afbrydelser"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfigurer begrænsede afbrydelser"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Begrænsede afbrydelser"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Vis på låseskærmen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Medmindre indholdet er følsomt"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Alle underretninger"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Forstyr ikke"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Forstyr ikke"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Underretninger"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Generelt"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sikkerhed"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Justeringer"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apps"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Konfigurer NFC-tag for Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryk på et tag for at skrive..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Ugyldig adgangskode. Prøv igen."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Gennemført!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Der kan ikke skrives data til NFC-tagget. Hvis problemet fortsætter, skal du prøve et andet tag"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Der kan ikke skrives til NFC-tagget. Brug et andet tag."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Vis underretninger"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Høj prioritet"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Udført"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Når aktiveret, begræns afbrydelser til"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Slå automatisk til for dvale"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonopkald"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Beskeder"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Fra"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kun kontaktpersoner"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kun stjernemarkerede kontakter"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Du vil altid høre alarmer og timere i Vil ikke forstyrres"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Hvornår"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver nat"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hverdagsaftener"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 944071c..7ab3d57 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Netz-Info:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datenversuche:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-Service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -631,8 +630,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Geben Sie Ihr Netzwerkpasswort ein."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist.\n\nMöchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
@@ -704,8 +702,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standard-Benachrichtigungston"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Warnungen"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Wichtige Benachrichtigungen werden angezeigt."</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up bei hoher Priorität"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Benachrichtigung"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Lautstärke für eingehende Anrufe für Benachrichtigungen verwenden"</string>
@@ -1852,6 +1849,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clip-Begrenzungen, Ränder usw. anzeigen"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL-Layout erzwingen"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"RTL-Bildschirmlayout für alle Sprachen erzwingen"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Energiesparmodus"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Einstellungen für Energiesparmodus aktivieren"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-Auslastung anzeigen"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Bildschirm-Overlay mit aktueller CPU-Auslastung"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-Rendering erzwingen"</string>
@@ -2103,30 +2102,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Suchen"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Sucheinstellungen"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wlan wifi wi-fi netzwerkverbindung"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Sperrbildschirmanzeige"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Keine sensiblen Benachrichtigungsinhalte auf dem Sperrbildschirm."</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Alle Benachrichtigungsinhalte auf dem Sperrbildschirm."</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Begrenzte Unterbrechungen"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Begr. Unterbrechungen konfig."</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Beschränkte Unterbrechungen"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Auf Sperrbildschirm zeigen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Keine heiklen Inhalte"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Alle Benachrichtigungen"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Bitte nicht stören"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Bitte nicht stören"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Benachrichtigungen"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Allgemein"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sicherheit"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apps"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WLAN-NFC-Tag einrichten"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Zum Schreiben auf ein Tag tippen…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Ungültiges Passwort. Bitte versuchen Sie es erneut."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Erfolgreich ausgeführt!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Es können keine Daten in das NFC-Tag geschrieben werden. Sollte das Problem weiterhin bestehen, versuchen Sie es mit einem anderen Tag."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"In das NFC-Tag kann nicht geschrieben werden. Bitte verwenden Sie ein anderes Tag."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Standardton"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Benachrichtigungen anzeigen"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hohe Priorität"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fertig"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Wenn aktiv, Unterbrechungen begrenzen auf"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Für Ruhemodus automatisch aktivieren"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonanrufe"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Von"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Alle"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Nur Kontakte"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Nur markierte Kontakte"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Im Modus \"Nicht stören\" hören Sie alle Weckrufe und Timer."</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Wann"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nie"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Jede Nacht"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Wochentags abends"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Startzeit"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Endzeit"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Am nächsten Tag um <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 43e2a46..fef5cad 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Τοποθεσία:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Γειτονικά CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Πληροφορίες κελιού:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Προσπάθειες δεδομένων:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Υπηρεσία GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Περιαγωγή:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ασφαλισμένα με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ασφαλισμένο με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Εισαγάγετε τον κωδικό πρόσβασης του δικτύου σας."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Καμία"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο.\n\nΝα επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Να επιτραπεί"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Φωτεινός παλμός ειδοποίησης"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Προειδοποιήσεις"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Θα εμφανίζονται σημαντικές ειδοποιήσεις"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Αναδ.παρ. για υψηλής προτερ."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ήχος κλήσης"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ειδοποίηση"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Χρήση έντασης ήχου εισερχόμενης κλήσης για ειδοποιήσεις"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Εμφάνιση ορίων κλιπ, περιθωρίων, κλπ."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Επιβολή κατ. διάταξης RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Επιβολή διάταξης οθόν. RTL για όλες τις τοπ. ρυθμ."</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Χαμηλή καταν. ενέργειας"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Ενεργ.ρυθ.εξοικονόμησης ενέργειας μπαταρίας"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Προβολή χρήσης CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Αναγκαστική απόδοση GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Αναζήτηση"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Ρυθμίσεις αναζήτησης"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi σύνδεση δικτύου"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Εμφάνιση κατά το κλείδωμα"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Απόκρυψη ευαίσθητου περιεχ.ειδοπ.σε οθόνη κλειδ."</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Εμφάνιση περιεχ.ειδοποιήσεων σε οθόνη κλειδώματος"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Περιορισμένες διακοπές"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Ρύθμιση περιορισμένων διακοπών"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Περιορισμένες διακοπές"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Εμφάνιση σε οθόνη κλειδ."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Εκτός αν το περιεχόμενο είναι ευαίσθητο"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Όλες οι ειδοποιήσεις"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Μην ενοχλείτε"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Μην ενοχλείτε"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Ειδοποιήσεις"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Γενικά"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Ασφάλεια"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Προσαρμογές"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Εφαρμογές"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Μη έγκυρος κωδικός πρόσβασης, δοκιμάστε ξανά."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Ωραία!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Δεν είναι δυνατή η εγγραφή δεδομένων στην ετικέτα ΕΚΠ. Εάν το πρόβλημα εξακολουθεί να παρουσιάζεται, δοκιμάστε μια διαφορετική ετικέτα"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Δεν υπάρχει δυνατότητα εγγραφής στην ετικέτα ΕΚΠ. Χρησιμοποιήστε μια διαφορετική ετικέτα."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Προεπιλεγμένος ήχος"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Ειδοποιήσεις εφαρμογών"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Εμφάνιση ειδοποιήσεων"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Υψηλής προτεραιότητας"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Τέλος"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Εάν είναι ενεργό, διακοπές μόνο σε"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Αυτόματη ενεργοποίηση σε λειτ. αδράνειας"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Τηλεφωνικές κλήσεις"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Μηνύματα"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Από"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Οποιοσδήποτε"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Μόνο επαφές"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Μόνο επαφές με αστέρι"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Θα ακούγονται πάντα ξυπνητήρι/χρονόμ. σε λειτ. Μην ενοχλείτε"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Πότε"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Ποτέ"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Κάθε βράδυ"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Καθημερινές"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Ώρα έναρξης"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Ώρα λήξης"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> επόμενη μέρα"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e6c83c7..db5bc54 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Enter your network password."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Heads Up Notifications"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Important notifications will pop up"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up if high priority"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout direction"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout direction to RTL for all locales"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Search"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Search settings"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Show when locked"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Sensitive notification contents will be hidden on the lock screen"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"All notification contents will be shown on the lock screen"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Limited interruptions"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Configure limited interruptions"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Limited Interruptions"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Show on lock screen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Unless content is sensitive"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"All notifications"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Do not disturb"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Do not disturb"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"General"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Security"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apps"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Set up Wi-Fi NFC Tag"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Write"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Invalid password, try again."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Success!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Unable to write data to NFC tag. If the problem persists, try a different tag"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Show notifications"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"High priority"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Finished"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e6c83c7..db5bc54 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Enter your network password."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Heads Up Notifications"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Important notifications will pop up"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up if high priority"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout direction"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout direction to RTL for all locales"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Search"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Search settings"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Show when locked"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Sensitive notification contents will be hidden on the lock screen"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"All notification contents will be shown on the lock screen"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Limited interruptions"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Configure limited interruptions"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Limited Interruptions"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Show on lock screen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Unless content is sensitive"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"All notifications"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Do not disturb"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Do not disturb"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"General"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Security"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apps"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Set up Wi-Fi NFC Tag"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Write"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Invalid password, try again."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Success!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Unable to write data to NFC tag. If the problem persists, try a different tag"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Show notifications"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"High priority"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Finished"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 188a6bc..de82c48 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ingresa la contraseña de red."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notificaciones de advertencia"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Notificaciones importantes emergentes"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Aparecer con prioridad alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar el volumen de las llamadas entrantes para las notificaciones"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de recortes, márgenes, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar diseño der. a izq."</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar diseño pantalla der.&gt;izq., cualquier idioma"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Modo de bajo consumo"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Habilitar configuración de ahorro de batería"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar el uso de CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mostrar superposición en pantalla con uso actual de la CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar representación GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Búsqueda"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Configuración de búsqueda"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Mostrar al bloquear"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Notif. personales ocultas en pantalla bloqueada"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Notificaciones visibles en la pantalla bloqueada"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interrupciones limitadas"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Configurar interrup. limitadas"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interrupciones limitadas"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Mostrar en pant. bloq."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"A menos que el contenido sea confidencial"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Todas las notificaciones"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"No molestar"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molestar"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notificaciones"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"General"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Seguridad"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustes"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplicaciones"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar etiqueta NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Presiona una etiqueta para editarla…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"La contraseña no es válida. Vuelve a intentarlo."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Acción finalizada correctamente"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"No se pudieron escribir datos en la etiqueta NFC. Si el problema persiste, prueba con una etiqueta diferente."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"No se puede escribir en la etiqueta NFC. Prueba con una etiqueta diferente."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificaciones"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridad alta"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Si activado, limitar interrupciones a"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Activar automáticamente en suspensión"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Llamadas telefónicas"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"De"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Cualquiera"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contactos"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contactos destacados"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Escuchar siempre alarmas y temporizadores en No molestar"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Cuándo"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 826eed8..d1564f6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Introduce la contraseña de la red."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada.\n\n¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Usar LED de notificaciones"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notificaciones de advertencia"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Notificaciones importantes emergentes"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Aparecer con prioridad alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volumen de llamada entrante para notificaciones"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar dirección diseño RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar dirección (RTL) para todas configuraciones"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Modo de baja energía"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Habilitar ajustes de ahorro de batería"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suporponer el uso de la CPU en la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar aceleración GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Buscar"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Ajustes de búsqueda"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Mostrar al bloquear"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Las notificaciones de carácter sensible no aparecerán en la pantalla de bloqueo"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Todas las notificaciones aparecerán en la pantalla de bloqueo"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interrupciones limitadas"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Configurar interrupciones limitadas"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interrupciones limitadas"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Mostrar en pant. bloqueo"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"A menos que el contenido sea confidencial"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Todas las notificaciones"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"No molestar"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molestar"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notificaciones"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"General"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Seguridad"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Cambios"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplicaciones"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar etiqueta NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta para editarla..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Contraseña no válida. Vuelve a intentarlo."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Operación realizada correctamente"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Error al escribir datos en la etiqueta NFC. Si el problema persiste, prueba con otra etiqueta"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"No se puede editar la etiqueta NFC. Prueba con otra etiqueta."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificaciones"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridad alta"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Si activado, limitar interrupciones a"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Activar automáticamente en suspensión"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Llamadas de teléfono"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"De"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Todo el mundo"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contactos"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contactos destacados"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Siempre oirás alarmas y temporizadores en No molestar"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Cuándo"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas las noches"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noches entre semana"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 6641a1d..911c33d 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Asukoht:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Külgnev CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Kärjeinfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Andmete katsed:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-teenus:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Rändlus:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Sisestage võrgu parool."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud.\n\nKas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreeri hääletus režiimis"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Märguande vaikeheli"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Tähelepanu juhtim. märguanded"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Kuvatakse olulised märguanded"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Kõrge priorit. kuvatakse hüpik"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Helin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Teatis"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Kasuta teatiste jaoks sissetuleva kõne helitugevust"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kuva klipi piirid, veerised jms"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paremalt vasakule paig."</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Määra lokaatides ekraanipaig. paremalt vasakule"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-kasutuse kuvamine"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Praegust CPU-kasutust kuvav ekraani ülekate"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Jõusta GPU renderdamine"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Otsing"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Otsinguseaded"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wifi-võrgu ühendus"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Kuva lukustatuna"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Tundliku sisuga märguanne on lukustuskuval peidet."</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Lukustuskuval näidatakse kogu märguande sisu"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Piiratud katkestustega"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Piiratud katkestuste seadistus"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Piiratud katkestustega"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Kuva lukustuskuval"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Kui sisu ei ole tundlik"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Kõik märguanded"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Mitte segada"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Mitte segada"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Märguanded"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Üldine"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Turvalisus"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Kohendused"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Rakendused"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC-kiibi seadistamine"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjutamiseks puudutage kiipi ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Vale parool, proovige uuesti."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Õnnestus!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC-kiibile ei saa andmeid kirjutada. Kui probleem püsib, proovige muud kiipi"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-kiip ei ole kirjutatav. Kasutage muud kiipi."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Vaikeheli"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduse märguanded"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Kuva märguanded"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Kõrge prioriteet"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 874dc6d..82400b0 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"مکان:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"‏CID مجاور:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"تلاش‌های داده:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"‏سرویس GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"رومینگ:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"گذرواژه شبکه خود را وارد کنید."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"هیچکدام"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است.\n\nاین مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"مجاز"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بی‌صدا"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صدای اعلان پیش‌فرض"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"چراغ اعلان چشمک بزند"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"اعلان‌های بازشو"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"اعلان‌های مهم نمایان خواهند شد"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"بازشدن در صورت بالابودن اولویت"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"آهنگ زنگ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"اعلان"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استفاده از صدای تماس ورودی برای اعلان‌ها"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"نمایش مرزها، حاشیه‌ها و ویژگی‌های دیگر کلیپ."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"‏اجباری کردن چیدمان RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"‏اجباری کردن چیدمان RTL صفحه برای همه زبان‌ها"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"‏نمایش میزان استفاده از CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"‏همپوشانی صفحهٔ نمایش میزان استفاده از CPU فعلی"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"‏اجبار به تفسیر و اجرای GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"جستجو"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"تنظیمات جستجو"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi ‏اتصال شبکه wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"نمایش روی صفحه قفل شده"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"محتوای اعلان‌های حساس روی صفحه قفل پنهان خواهد شد"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"کلیه محتوای اعلان روی صفحه قفل نشان داده می‌شود"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"وقفه‌های محدود"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"پیکربندی وقفه‌های محدود"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"وقفه‌های محدود"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"نمایش روی صفحه در حالت قفل"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"مگر اینکه محتوا حساس باشد"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"تمام اعلان‌ها"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"مزاحم نشوید"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"مزاحم نشوید"</string>
     <string name="notification_settings" msgid="8342078884790733726">"اعلان‌ها"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"کلی"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"امنیت"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"برنامه‌ها"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"‏تنظیم برچسب NFC برای WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"گذرواژه نادرست است، دوباره امتحان کنید."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"موفق شدید!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"‏نوشتن داده برای برچسب NFC ممکن نیست. اگر مشکل ادامه یافت، یک برچسب متفاوت را امتحان کنید"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"‏برچسب NFC قابل نوشتن نیست. لطفاً از یک برچسب متفاوت استفاده کنید."</string>
+    <string name="default_sound" msgid="8821684447333687810">"صدای پیش‌فرض"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"اعلان‌های برنامه"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"نمایش اعلان‌ها"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"اولویت بالا"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"انجام شد"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 28547e3..87d7bae 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRt-tiedot:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tiedonsiirtoyrityksiä:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-palvelu:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Kirjoita verkkosi salasana."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka wifi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
@@ -703,8 +701,8 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Ilmoituksen oletusääni"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Varoitusilmoitukset"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Tärkeät ilmoitukset näytetään"</string>
+    <!-- no translation found for heads_up_enabled_title (1031078221910921622) -->
+    <skip />
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ilmoitus"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Käytä ilmoituksille puhelun äänenvoimakkuutta"</string>
@@ -1851,6 +1849,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Näytä leikkeiden rajat, marginaalit jne."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Pakota RTL-ulkoasun suunta"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Pakota kaikkien kielten näytön ulkoasun suunnaksi RTL"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Näytä suorittimen käyttö"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Näytön peittokuva näyttää nykyisen suoritinkäytön"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Pakota GPU-hahmonnus"</string>
@@ -2102,30 +2104,70 @@
     <string name="search_menu" msgid="7053532283559077164">"Haku"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Hakuasetukset"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi verkko yhteys"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Näytä lukitusruudussa"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Henk.koht. ilmoitukset eivät näy lukitusruudussa"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Kaikki ilmoitukset näkyvät lukitusruudussa"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Mahdollisimman vähän häiriöitä"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Mahd. väh. häiriöitä -määritys"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Mahdollisimman vähän häiriöitä"</string>
+    <!-- no translation found for lock_screen_notifications (1785930071975221150) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (2477642360263652408) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7897541882520048340) -->
+    <skip />
+    <!-- no translation found for title_zen_mode (4587203077066257425) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
+    <skip />
     <string name="notification_settings" msgid="8342078884790733726">"Ilmoitukset"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Yleiset"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Suojaus"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Säädöt"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Sovellukset"</string>
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi-yhteyden NFC-tunnisteen asetus"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tunnistetta…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Virheellinen salasana, yritä uudelleen."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Onnistui!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Tietojen kirjoittaminen NFC-tunnisteeseen epäonnistui. Jos ongelma jatkuu, kokeile toista tunnistetta."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tunnisteeseen ei voi kirjoittaa. Käytä toista tunnistetta."</string>
+    <!-- no translation found for default_sound (8821684447333687810) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for app_notifications_dialog_show (6912410502091785846) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for app_notifications_dialog_priority (2692156022435161791) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
+    <skip />
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
+    <skip />
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 14bf3c6..6a24ef5 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo :"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Entrez votre mot de passe réseau."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucun"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Faire clignoter le voyant de notification"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notifications anticipées"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Les notif. import. s\'affichent ds fen. context."</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Fen. context. priorité élevée"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utiliser le volume des appels entrants pour les notifications"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer orient. : g. à d."</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forcer l\'orientation: g. à droite (toutes langues)"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Mode Économie d\'énergie"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Activer les paramètres d\'économie d\'énergie"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
@@ -2104,30 +2103,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Rechercher"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paramètres de recherche"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connexion réseau wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Aff. si écran verrouillé"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Notif. sensibles masquées sur écran verrouillage"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Toutes notif. affichées sur écran de verrouillage"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interruptions limitées"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Config. interruptions limitées"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interruptions limitées"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Aff. sur écran verrouill."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Sauf si le contenu est sensible"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Toutes les notifications"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ne pas déranger"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne pas déranger"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Général"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sécurité"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustements"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Applications"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurer une balise NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Touchez une balise pour pour écrire..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Mot de passe non valide, veuillez réessayer."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Succès!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Impossible d\'écrire des données sur la balise NFC. Si le problème persiste, essayez avec une autre balise."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"La balise NFC n\'est pas accessible en écriture. Veuillez en utiliser un autre."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Afficher les notifications"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Priorité élevée"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminé"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Si activé, limiter les interruptions à"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Activer automatiquement en mode Veille"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Appels téléphoniques"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"De"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"N\'importe qui"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Contacts seulement"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Contacts favoris seulement"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"En mode Ne pas déranger, vous entendez toujours les alarmes et les minuteurs"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Quand"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Jamais"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Tous les soirs"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Les soirs de semaine"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5cac721..bad457b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo :"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Veuillez saisir votre mot de passe réseau."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notifications anticipées"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Notif. importantes affichées dans des pop-up."</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Ouvrir pop-up si priorité élevée"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utiliser le volume des appels entrants pour les notifications"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer droite à gauche"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forcer orient. droite à gauche pour toutes langues"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
@@ -2104,30 +2105,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Rechercher"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paramètres de recherche"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi réseau connexion"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Aff. si écran verrouillé"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Notif. sensibles masquées sur écran verrouillage"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Toutes les notif. affichées sur écran verrouillage"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interruptions limitées"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Config. interruptions limitées"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interruptions limitées"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Afficher sur écran verr."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Sauf si le contenu est confidentiel"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Toutes les notifications"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ne pas déranger"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne pas déranger"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Général"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sécurité"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustements"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Applications"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurer un tag NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Appuyer sur un tag pour le modifier…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Mot de passe erroné. Veuillez réessayer."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Opération réussie."</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Impossible de modifier des données sur le tag NFC. Si le problème persiste, essayez avec un autre tag."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Le tag NFC n\'est pas accessible en écriture. Veuillez en utiliser un autre."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Afficher les notifications"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Priorité élevée"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"OK"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f3d2615..03fba78 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"स्थान:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"समीपस्‍थ CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"सेल जानकारी:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"जानकारी स्क्रीन:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"डेटा प्रयास:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"अपना नेटवर्क पासवर्ड डालें."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"कोई नहीं"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है.\n\nइसकी अनुमति उन सभी ऐप्स  के लिए दें जो स्कैन करना चाहते हैं?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"सामान्य सूचना ध्वनि"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"पल्‍स सूचना लाइट"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"अग्रिम सूचनाएं"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"महत्वपूर्ण सूचनाएं पॉप अप हो जाएंगी"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"उच्च प्राथमिकता होने पर पॉप अप"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"सूचना"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचनाओं के लिए इनकमिंग कॉल वॉल्‍यूम का उपयोग करें"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"क्लिप सीमाएं, मार्जिन, आदि दिखाएं."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL लेआउट दिशा लागू करें"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"सभी भाषाओं के लिए स्क्रीन लेआउट दिशा को RTL रखें"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"कम पावर मोड"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"बैटरी की बचत सेटिंग सक्षम करें"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU उपयोग दिखाएं"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"स्‍क्रीन ओवरले वर्तमान CPU उपयोग को दिखा रहा है"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"बलपूर्वक GPU रेंडर करें"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"खोजें"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"खोज सेटिंग"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi नेटवर्क कनेक्शन"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"लॉक होने पर दिखाएं"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"संवेदी सूचना सामग्रियां लॉक स्क्रीन पर छिपी रहेंगी"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"सभी सूचना सामग्रियां लॉक स्क्रीन पर दिखाई जाएंगी"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"सीमित बाधाएं"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"सीमित बाधाओं को कॉन्फ़िगर करें"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"सीमित बाधाएं"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"लॉक स्क्रीन पर दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"जब तक कि सामग्री संवेदनशील न हो"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"सभी सूचनाएं"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"परेशान न करें"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"परेशान न करें"</string>
     <string name="notification_settings" msgid="8342078884790733726">"सूचनाएं"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"सामान्य"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"सुरक्षा"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"ट्वीक"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"ऐप्स"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स सूचनाएं"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC टैग सेट करना"</string>
+    <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"अमान्य पासवर्ड, पुनः प्रयास करें."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"सफल!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC टैग में डेटा लिखने में असमर्थ. यदि समस्या बनी रहती है, तो कोई भिन्न टैग आज़माकर देखें"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टैग लिखने योग्य नहीं है. कृपया किसी भिन्न टैग का उपयोग करें."</string>
+    <string name="default_sound" msgid="8821684447333687810">"डिफ़ॉल्‍ट ध्‍वनि"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स सूचनाएं"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"सूचनाएं दिखाएं"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"उच्च प्राथमिकता"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"चालू होने पर, रुकावटें इस तक सीमित करें"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"निष्क्रिय के लिए अपने आप चालू करें"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"फ़ोन कॉल"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"प्रेषक"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"कोई भी"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"केवल संपर्क"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"केवल तारांकित संपर्क"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"आपको अलार्म और टाइमर हमेशा, परेशान न करें में सुनाई देंगे"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"कब"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"कभी नहीं"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"हर रात"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"कार्यदिवसों की रात"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ समय"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ति समय"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"अगले दिन <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0928582..d78032b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Informacije o DcRt:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji za podatke:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS usluga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Unesite mrežnu zaporku."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Zadani zvuk obavijesti"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Upozorenja"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Prikaz važnih obavijesti u skočnom prozoru"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Skočni za visoki prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obavijest"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi glasnoću dolaznog poziva za obavijesti"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Za isječak prikaži granice, margine itd."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Nametni zdesna ulijevo"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Nametni smjer zdesna ulijevo za sve zemlje/jezike"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži upotrebu procesora"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje trenutačnu upotrebu procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Prisilno GPU renderiranje"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Pretražite"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Postavke pretraživanja"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi mreža veza"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Prikaži kad je zaključano"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Osjetljivi sadržaji neće biti na zaključ. zaslonu"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Na zaključanom zaslonu prikazuju se sve obavijesti"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ograničeni prekidi"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfiguriraj ograničeni prekid"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ograničeni prekidi"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Prikaži na zaklj. zaslonu"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Ako sadržaj nije osjetljiv"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Sve obavijesti"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ne ometaj"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne ometaj"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Obavijesti"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Općenito"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sigurnost"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Prilagođavanja"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplikacije"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Postavljanje oznake NFC za WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste zapisali podatke..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Nevažeća zaporka, pokušajte ponovo."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Uspjeli ste!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Nije moguće zapisati podatke u oznaku NFC. Ako problem potraje, pokušajte upotrijebiti drugačiju oznaku."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"U oznaku NFC ne mogu se zapisati podaci. Upotrijebite drugačiju oznaku."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Zadani zvuk"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Prikaži obavijesti"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Visoki prioritet"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 97301af..34de43e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellainformáció:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Adatkísérletek:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS szolgáltatás:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Barangolás:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Adja meg hálózati jelszavát."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is.\n\nEngedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Alapértelmezett értesítési hang"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Villogó értesítő fény"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Előrejelzési értesítések"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"A fontos értesítések felugranak"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"A magas prioritású jelenjen meg"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Értesítés"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bejövő hívások hangerejének használata az értesítéseknél"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Elrendezés jobbról balra"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Elrendezés jobbról balra minden nyelvnél"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Alacsony energia mód"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Energiatakarékos beállítások engedélyezése"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-használat mutatása"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Képernyőfedvény a jelenlegi CPU-használattal"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-megjelenítés"</string>
@@ -2104,30 +2103,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Keresés"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Keresési beállítások"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi hálózati kapcsolat"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Megjelenítés zároláskor"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Bizalmas értesítések elrejtése lezárási képernyőn"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Minden értesítés látható lesz a lezárási képernyőn"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Korlátozott számú megszakítás"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Korlátozott számú megszakítás"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Korlátozott megszakítások"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Lezárási képernyőn"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Kivéve, ha a tartalom bizalmas"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Összes értesítés"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ne zavarjanak"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne zavarjanak"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Értesítések"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Általános"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Biztonság"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Trükkök"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Alkalmazások"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi- és NFC-címke beállítása"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Az íráshoz érintsen meg egy címkét…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Érvénytelen jelszó, próbálja újra."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Sikerült!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Nem sikerült írni az NFC-címkére. Ha a probléma továbbra is fennáll, próbálkozzon egy másik címkével"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Az NFC-címke nem írható. Használjon egy másik címkét."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Alapértelmezett hang"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Értesítések megjelenítése"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Magas prioritás"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kész"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Bekapcsolva korlátozza a megszakításokat erre:"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Automatikusan bekapcsol alvó üzemmódban"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonhívások"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Üzenetek"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Kezdet"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bárki"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Csak ismerősök"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Csak a csillagozott ismerősök"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Hallani fogja a riasztást és időzítőt „Ne zavarjanak” módban"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Időpont"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Soha"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Minden este"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Hétköznap este"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Kezdés ideje"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Befejezés ideje"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 35df99c..a17e070 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Տեղակայում."</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Կից CID՝"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Բջջայինի տեղեկություններ`"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Տվյալների փորձերը՝"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS ծառայություն`"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ռոումինգ`"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Պաշտպանված է <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ով"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ապահովված <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ի հետ"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Մուտքագրեք ձեր ցանցային գաղտնաբառը:"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ոչ մեկը"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Տեղանքի ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` <xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել ցանցի սկանավորումը, նույնիսկ եթե Wi-Fi-ը անջատված է:\n\nԹույլատրե՞լ բոլոր սկանավորում ցանկացող ծրագրերին:"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Թույլատրել"</string>
@@ -703,8 +701,8 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Թրթռալ, երբ անձայն ռեժիմում է"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Ծանուցման լռելյայն ձայնը"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Ծանուցման լույսի թարթում"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Ցույց տալ կարևոր ծանուցումները"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Կարևոր ծանուցումները կերևան ելնող պատուհանում"</string>
+    <!-- no translation found for heads_up_enabled_title (1031078221910921622) -->
+    <skip />
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Զանգերանգ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ծանուցում"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Օգտագործել մուտքային ձայնի բարձրությունը ծանուցումների համար"</string>
@@ -1851,6 +1849,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Ցույց տալ կտրվածքի սահմանները, լուսանցքները և այլն"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Փոխել RTL-ի դասավորության ուղղությունը"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Դարձնել էկրանի դասավորության ուղղությունը դեպի RTL բոլոր լեզուների համար"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Ցույց տալ CPU-ի աշխատանքը"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Էկրանի վերադրումը ցույց է տալիս ընթացիկ CPU օգտագործումը"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Ստիպել GPU-ին մատուցել"</string>
@@ -2102,30 +2104,70 @@
     <string name="search_menu" msgid="7053532283559077164">"Որոնել"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Որոնման կարգավորումներ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ցանցային կապ"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Ցույց տալ, երբ կողպված է"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Զգայուն ծանուցման բովանդակությունը չի երևա կողպէկրանին"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Ցանկացած ծանուցման բովանդակություն կերևա կողպէկրանին"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Սահմանափակ ընդհատումներ"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Կարգավորել սահմանափակ ընդհատումները"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Սահմանափակ ընդհատումներ"</string>
+    <!-- no translation found for lock_screen_notifications (1785930071975221150) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (2477642360263652408) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7897541882520048340) -->
+    <skip />
+    <!-- no translation found for title_zen_mode (4587203077066257425) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
+    <skip />
     <string name="notification_settings" msgid="8342078884790733726">"Ծանուցումներ"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Ընդհանուր"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Անվտանգություն"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Մեջբերումներ"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Ծրագրեր"</string>
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Կարգավորեք WiFi NFC պիտակը"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Հպեք պիտակի վրա՝ գրելու համար..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Գաղտնաբառը սխալ է, կրկին փորձեք:"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Հաջողվեց:"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Անհնար է գրել տվյալները NFC պիտակում: Եթե ​​խնդիրը չկարգավորվի, փորձեք մեկ այլ պիտակ"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC պիտակում հնարավոր չէ գրել: Խնդրում ենք օգտագործել այլ պիտակ:"</string>
+    <!-- no translation found for default_sound (8821684447333687810) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for app_notifications_dialog_show (6912410502091785846) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for app_notifications_dialog_priority (2692156022435161791) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
+    <skip />
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
+    <skip />
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e5ac3eb..d88d612 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID bersebelahan:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Layanan GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Masukkan sandi jaringan Anda."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suara pemberitahuan default"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Pemberitahuan Pengumuman"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Pemberitahuan penting akan muncul"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Munculan jika prioritas tinggi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan volume panggilan masuk untuk pemberitahuan"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Tampilkan batas klip, margin, dll."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paksa arah tata letak RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Paksa arah tata letak layar RTL untuk semua lokal"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Mode Daya Rendah"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktifkan setelan hemat baterai"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Tampilkan penggunaan CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Hamparan layar menampilkan penggunaan CPU saat ini"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa perenderan GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Telusuri"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Setelan penelusuran"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection sambungan jaringan"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Tampilkan saat terkunci"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Isi notifikasi sensitif tak tampil di layar kunci"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Semua konten notifikasi tampil di layar kunci"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Gangguan terbatas"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfigurasi gangguan terbatas"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Gangguan Terbatas"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Tampilkan di layar kunci"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Kecuali konten sensitif"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Semua pemberitahuan"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Jangan ganggu"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Jangan ganggu"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notifikasi"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Umum"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Keamanan"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Otak-atik"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplikasi"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan pemberitahuan"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Siapkan Tag NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketuk tag untuk menulis..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Sandi tidak valid, coba lagi."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Berhasil!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Tidak dapat menulis data ke tag NFC. Jika masalah berlanjut, coba tag lain"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Tag NFC tidak dapat ditulisi. Gunakan tag lain."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Suara default"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan aplikasi"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Tampilkan pemberitahuan"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioritas tinggi"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Saat aktif, batasi gangguan ke"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Otomatis aktif untuk mode tidur"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Panggilan telepon"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Pesan"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Dari"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Semua orang"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Kontak saja"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontak berbintang saja"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Anda akan selalu mendengar alarm &amp; pewaktu di Jangan ganggu"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Kapan"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Tidak pernah"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Setiap malam"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Malam hari kerja"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Waktu mulai"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Waktu berakhir"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 40e8638..7f4058d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativi dati:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servizio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Inserisci la password di rete."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suono di notifica predefinito"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luce di notifica pulsante"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notifiche Heads Up"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Vengono visualizzate le notifiche importanti"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Notif. popup per alta priorità"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notifica"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usa volume chiamate in entrata per le notifiche"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra limiti, margini dei clip e così via"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forza direzione layout RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direzione layout schermo RTL per tutte le lingue"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Modalità basso consumo"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Attiva impostazioni di risparmio energetico"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra utilizzo CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay schermo che mostra l\'uso corrente della CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forza rendering GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Cerca"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Impostazioni di ricerca"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connessione rete Wi-Fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Mostra quando bloccato"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Contenuti sensibili nascosti nella schermata di blocco"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Tutti i contenuti mostrati nella schermata di blocco"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interruzioni limitate"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Configura interruzioni limitate"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interruzioni limitate"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Mostra in scherm. blocco"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"A meno che i contenuti siano sensibili"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Tutte le notifiche"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Non disturbare"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Non disturbare"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notifiche"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Generali"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sicurezza"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Regolazioni"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"App"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Imposta tag NFC WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tocca un tag per impostarlo..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Password non valida. Riprova."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Operazione riuscita."</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Impossibile inserire dati nel tag NFC. Se il problema persiste, prova con un tag diverso."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Il tag NFC non è modificabile. Utilizza un tag diverso."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Suono predefinito"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostra notifiche"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Alta priorità"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fine"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Quando attiva, limita le interruzioni a"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Attiva automatic. modalità sospensione"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonate"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Da"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Chiunque"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Solo contatti"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Solo contatti Speciali"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Sentirai segnali sonori e timer nella modalità Non disturbare"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Quando"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ogni notte"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Sere giorni feriali"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora di inizio"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora di fine"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6899d0e..523dfe8 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"‏CID שכן:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"נתונים:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ניסיונות נתונים:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"‏שירות GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"נדידה:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"הזן את סיסמת הרשת שלך."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"צליל ברירת מחדל להתראה"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"תאורת התראה של אות"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"הודעות התראה"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"הודעות חשובות יופיעו כחלון קופץ"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"חלון קופץ לעדיפות גבוהה"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"צלצול"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"התראה"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להתראות"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"הצג גבולות קליפ, שוליים וכו\'"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"אלץ כיוון פריסה מימין לשמאל"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"אלץ כיוון פריסת מסך מימין לשמאל עבור כל השפות בכל המקומות"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"מצב חיסכון בחשמל"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"הפעל הגדרות לחיסכון בחיי סוללה"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"‏הצג את השימוש ב-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"‏שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"‏אלץ עיבוד ב-GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"חפש"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"הגדרות חיפוש"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi חיבור רשת"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"הצג כשהמסך נעול"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"תוכן הודעות רגישות יוסתר במסך הנעילה"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"כל תוכן ההודעות יוצג במסך הנעילה"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"הפרעות מוגבלות"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"הגדר הפרעות מוגבלות"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"הפרעות מוגבלות"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"הצג במסך הנעילה"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"אלא אם התוכן רגיש"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"כל ההודעות"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"נא לא להפריע"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"נא לא להפריע"</string>
     <string name="notification_settings" msgid="8342078884790733726">"הודעות"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"כללי"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"אבטחה"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"שיפורים"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"אפליקציות"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"‏הגדר תג NFC עבור WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"סיסמה לא חוקית, נסה שוב."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"הצלחת!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"‏לא ניתן לכתוב נתונים לתג NFC. אם הבעיה נמשכת, נסה תג אחר"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"‏תג NFC אינו ניתן לכתיבה. השתמש בתג אחר."</string>
+    <string name="default_sound" msgid="8821684447333687810">"צליל ברירת מחדל"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"הצג הודעות"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"עדיפות גבוהה"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"בוצע"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"כשהאפשרות פועלת, הגבל הפרעות ל-"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"הפעל אוטומטית לשינה"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"שיחות טלפון"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"הודעות"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"מ-"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"כל אחד"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"אנשי קשר בלבד"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"רק אנשי קשר המסומנים בכוכב"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"תמיד תשמע התראות ושעונים מעוררים במצב \'נא לא להפריע\'"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"מתי"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"אף פעם"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"בכל לילה"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"לילות בימי חול"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"שעת התחלה"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"שעת סיום"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d8b40ac..40b02ce 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -209,8 +209,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ロケーション:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"近くのCID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"セル情報:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"データの試行:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRSサービス:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ローミング:"</string>
@@ -632,8 +631,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"ネットワークパスワードを入力してください。"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-FiがOFFのときでもネットワークスキャンをオンにすることを要求しています。\n\nスキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"許可する"</string>
@@ -705,8 +703,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"マナーモード時のバイブレーション"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"デフォルトの通知音"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"重要な通知"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"重要な通知がポップアップ表示されます"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"最優先の場合はポップアップ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"着信音"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音にも着信音量を適用"</string>
@@ -1857,6 +1854,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"クリップの境界線、マージンなどを表示"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTLレイアウト方向を使用"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"すべての言語/地域で画面レイアウト方向をRTLに設定"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"現在のCPU使用状況をオーバーレイ表示する"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPUレンダリングを使用"</string>
@@ -2108,30 +2109,58 @@
     <string name="search_menu" msgid="7053532283559077164">"検索"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"検索設定"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ネットワーク 接続"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"ロック時に表示"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"プライベートな通知内容はロック画面に表示されません"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"すべての通知内容がロック画面に表示されます"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"制限付き中断"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"制限付き中断を設定"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"制限付き中断"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"ロック画面に表示"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"プライベートな内容以外"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"すべての通知"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"通知を非表示"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"通知を非表示"</string>
     <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"全般"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"セキュリティ"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"アプリ"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi NFCタグのセットアップ"</string>
+    <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"書き込むにはタグをタップしてください..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"パスワードが無効です。もう一度お試しください。"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"書き込み完了"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFCタグにデータを書き込めません。問題が解決しない場合は別のタグをお試しください。"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFCタグに書き込めません。別のタグを使用してください。"</string>
+    <string name="default_sound" msgid="8821684447333687810">"デフォルトの通知音"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"通知を表示"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"最優先"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完了"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index fc8751b..4cb3ee8 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"მდებარეობა:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"მეზობელი CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ქსელის ინფო:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"მონაცემების მცდელობები:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS სერვისი:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"როუმინგი:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"დაცულია <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ით"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", დაცული <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ის მეშვეობით"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"შეიყვანეთ თქვენი ქსელის პაროლი."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"არცერთი"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"მდებარეობის ზუსტი განსაზღვრის და სხვა ფუნქციების გასაუმჯობესებლად <xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, გააქტიურდეს ქსელების მოძიება, მაშინაც კი, როცა გამორთულია Wi-Fi.\n\nმიეცეს ამის უფლება ყველა აპს?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ნებართვა"</string>
@@ -703,8 +701,8 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ვიბრაცია დადუმებული ზარისას"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ნაგულისხმევი ხმა შეტყობინებისთვის"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"მოვლენების ინდიკატორი"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"წინასწარი შეტყობინებები"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"მნიშვნელოვანი შეტყობინებები გაიხსნება"</string>
+    <!-- no translation found for heads_up_enabled_title (1031078221910921622) -->
+    <skip />
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ზარი"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"შეტყობინებები"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"შემომავალი ზარის ხმის დონის გამოყენება შეტყობინებებისთვის"</string>
@@ -1851,6 +1849,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"კლიპის საზღვრების, მინდვრების ჩვენება და ა.შ."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"მარჯვნიდან მარცხნივ განლაგების მიმართულების იძულება"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ეკრანის RTL მიმართულებაზე იძულება ყველა ლოკალისათვის"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"ცენტრალური პროცესორის ჩატვირთვის ჩვენება"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"ეკრანის გადაფარვა აჩვენებს CPU ამჟამინდელ გამოყენებას"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-აჩქარება"</string>
@@ -2102,30 +2104,70 @@
     <string name="search_menu" msgid="7053532283559077164">"ძიება"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"ძიების პარამეტრები"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ქსელის კავშირი"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"ჩვენება ჩაკეტვისას"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"სენსიტიური შინაარსის მქონე შეტყობინებები ჩაკეტილ ეკრანზე არ გამოჩნდება"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"ყველა შინაარსის მქონე შეტყობინებები გამოჩნდება ჩაკეტილ ეკრანზე"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"შეზღუდული შეწყვეტები"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"შეზღუდული წყვეტების კონფიგურაცია"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"შეზღუდული შეწყვეტები"</string>
+    <!-- no translation found for lock_screen_notifications (1785930071975221150) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (2477642360263652408) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7897541882520048340) -->
+    <skip />
+    <!-- no translation found for title_zen_mode (4587203077066257425) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
+    <skip />
     <string name="notification_settings" msgid="8342078884790733726">"შეტყობინებები"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"ზოგადი"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"უსაფრთხოება"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"მორგებები"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"აპები"</string>
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC თეგის დაყენება"</string>
+    <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"შეეხეთ თეგს დასაწერად..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"პაროლი არასწორია, სცადეთ ისევ."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"წარმატება!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC თეგზე მონაცემების ჩაწერა ვერ ხერხდება. თუ პრობლემა გამეორდება, სცადეთ სხვა თეგი"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC თეგი ჩაწერადი არ არის. გთხოვთ, გამოიყენოთ სხვა თეგი."</string>
+    <!-- no translation found for default_sound (8821684447333687810) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for app_notifications_dialog_show (6912410502091785846) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for app_notifications_dialog_priority (2692156022435161791) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
+    <skip />
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
+    <skip />
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 7848baa..6ecedd2 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ទីតាំង៖"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID នៅ​ជិត៖"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ព័ត៌មាន​ចល័ត៖"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ការ​សាកល្បង​​ទិន្នន័យ៖"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"សេវាកម្ម GPRS ៖"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"រ៉ូមីង៖"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"មាន​សុវត្ថិភាព​ជា​មួយ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", មាន​សុវត្ថិភាព​ជា​មួយ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"បញ្ចូល​ពាក្យសម្ងាត់​បណ្ដាញ​របស់​អ្នក។"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"គ្មាន"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោល​បំណង​ផ្សេងៗ <xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ការ​វិភាគ រក​បណ្ដាញ ទោះ​បី​ជា​បិទ វ៉ាយហ្វាយ ក៏​ដោយ។\n\nអនុញ្ញាត​សម្រាប់​កម្មវិធី​ទាំងអស់​ដែល​អ្នក​ចង់​វិភាគ​រក?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"អនុញ្ញាត"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ញ័រ​ពេល​ស្ងាត់"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"សំឡេង​ជូន​ដំណឹង​លំនាំដើម"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ពន្លឺ​ជូន​ដំណឹង​ភ្លឺបភ្លែត"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"ទទួល​ការ​ជូនដំណឹង"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"ការ​ជូនដំណឹង​សំខាន់​នឹង​លេចឡើង"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"លេចឡើង​ ​បើ​អាទិភាព​ខ្ពស់"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"សំឡេង​រោទ៍"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ការ​ជូន​ដំណឹង"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ប្រើ​កម្រិត​សំឡេង​ហៅ​ចូល​សម្រាប់​ជូន​ដំណឹង"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"បង្ហាញ​ការ​ភ្ជាប់​អត្ថបទ​សម្រង់ រឹម ។ល។"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"បង្ខំ​ទិស​ប្លង់ RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"បង្ខំ​ទិស​ប្លង់​អេក្រង់​ទៅកាន់ RTL សម្រាប់​មូលដ្ឋាន​ទាំងអស់"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"របៀប​ប្រើ​ថ្ម​តិច"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"បើក​ការ​កំណត់​សន្សំ​ថ្ម"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"បង្ហាញ​​ការ​ប្រើ CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"អេក្រង់​ត្រួត​គ្នា​បង្ហាញ​​ការ​ប្រើ CPU បច្ចុប្បន្ន"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"បង្ខំ​ឲ្យ​បង្ហាញ GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"ស្វែងរក"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"កំណត់​ការ​​ស្វែងរក"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ការ​ភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"បង្ហាញ​ពេល​ជាប់​សោ"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"មាតិកាជូនដំណឹងជាក់លាក់នឹងលាក់ពេលអេក្រង់ជាប់សោ"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"មាតិកាជូនដំណឹងទាំងអស់នឹងបង្ហាញពេលអេក្រង់ជាប់សោ"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"ការ​រំខាន​​មាន​កំណត់"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"កំណត់រចនាសម្ព័ន្ធការរំខានមានកំណត់"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"ការ​ផ្អាក​បាន​កំណត់"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"បង្ហាញនៅលើអេក្រង់ជាប់​សោ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"លុះ​ត្រា​តែ​មាតិកា​ត្រឹមត្រូវ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"ការ​ជូន​ដំណឹង​ទាំងអស់"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"កុំ​រំខាន"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"កុំ​រំខាន"</string>
     <string name="notification_settings" msgid="8342078884790733726">"ការ​ជូនដំណឹង"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"ទូទៅ"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"សន្តិសុខ"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"កែប្រែ"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"កម្មវិធី"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"រៀប​ចំ​ស្លាក​អិនអេហ្វស៊ី​វ៉ាយហ្វាយ"</string>
+    <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ព្យាយាម​ម្ដងទៀត។"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"ជោគជ័យ!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"មិន​អាច​សរសេរ​ទិន្នន័យ​ទៅ​ស្លាក​អិនអេហ្វស៊ី។ បើ​នៅតែ​មាន​បញ្ហា​ សាកល្បង​​ស្លាក​ផ្សេង"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"ស្លាក​អិនអេហ្វ​ស៊ី​មិន​អាច​សរសេរ​បាន។ សូម​ប្រើ​ស្លាក​ផ្សេង។"</string>
+    <string name="default_sound" msgid="8821684447333687810">"សំឡេង​លំនាំ​ដើម"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"បង្ហាញ​ការ​ជូនដំណឹង"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"អាទិភាព​ខ្ពស់"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"រួចរាល់"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"នៅ​ពេល​បើក កំណត់​ការ​បញ្ឈប់​ទៅ"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"បើក​ស្វ័យ​ប្រវត្តិ​សម្រាប់​ដេក"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"ហៅ​ទូរស័ព្ទ"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"សារ"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"ពី"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"អ្នក​ណា​ម្នាក់"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"តែ​ទំនាក់ទំនង​​ប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"តែទំនាក់ទំនងមានផ្កាយប៉ុណ្ណោះ"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"អ្នកនឹងឮសំឡេងរោទ៍ និងកម្មវិធីកំណត់ម៉ោងក្នុងរបៀបកុំរំខាន"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"ពេលវេលា"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"កុំ"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"រាល់​យប់"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"យប់​សប្ដាហ៍​ធ្វើការ"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"ម៉ោង​ចាប់ផ្ដើម"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"ម៉ោង​បញ្ចប់"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃ​បន្ទាប់"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8465bd6..2f17b84 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"위치:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"인접한 CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"데이터 시도:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 서비스:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"로밍:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"네트워크 비밀번호를 입력하세요."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"없음"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다.\n\n검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"허용"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"무음 시 진동"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"기본 알림 소리"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"알림등 반복 표시"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"팝업 알림"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"중요한 알림이 팝업으로 표시됩니다."</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"높은 우선순위인 경우 표시"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"벨소리"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"알림"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"전화 벨소리와 알림을 같은 볼륨으로"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"클립 경계, 여백 등을 표시"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL 레이아웃 방향 강제 적용"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"모든 언어에 대해 화면 레이아웃 방향을 RTL로 강제 적용"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU 사용량 표시"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"현재 CPU 사용량 오버레이 표시"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU 렌더링 강제 설정"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"검색"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"검색 설정"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi 네트워크 연결"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"잠금 화면에서 표시"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"민감한 알림 내용은 잠금 화면에 표시되지 않습니다."</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"모든 알림 내용이 잠금 화면에 표시됩니다."</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"제한적 중단"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"제한적 중단 설정"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"제한적 중단"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"잠금 화면에 표시"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"민감한 콘텐츠가 아닌 경우"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"모든 알림"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"알림 일시중지"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"알림 일시중지"</string>
     <string name="notification_settings" msgid="8342078884790733726">"알림"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"일반"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"보안"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"변경"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"앱"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi NFC 태그 설정"</string>
+    <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"태그를 탭하여 작성하세요..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"비밀번호가 잘못되었습니다. 다시 시도해 주세요."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"완료"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC 태그에 데이터를 작성할 수 없습니다. 문제가 지속되는 경우 다른 태그를 사용해보세요."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC 태그를 작성할 수 없습니다. 다른 태그를 사용하세요."</string>
+    <string name="default_sound" msgid="8821684447333687810">"기본 사운드"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"알림 표시"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"높은 우선순위"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"완료"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 0a12eaa..d17e9df 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ສະຖານທີ່:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ໃກ້ຄຽງ:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ຂໍ້ມູນ cell:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ຄວາມ​ພະ​ຍາ​ຍາມ​ໃຊ້ຂໍ້​ມູນ:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"ບໍລິການ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ໂຣມມິງ​:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ຖືກປ້ອງກັນດ້ວຍ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ປ້ອງກັນດ້ວຍ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"​ກະ​ລຸ​ນາ​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ສັ່ນເຕືອນເມື່ອປິດສຽງ"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ສຽງແຈ້ງເຕືອນເລີ່ມຕົ້ນ"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ໄຟກະພິບແຈ້ງເຕືອນ"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"ລະ​ວັງ​ການ​ແຈ້ງ​ເຕືອນ"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"​ການ​ແຈ້ງ​ເຕືອນ​ສຳ​ຄັນ​ຈະ​ປາ​ກົດ​ຂຶ້ນ​ມາ"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"ສະແດງປັອບອັບ​ຖ້າຄວາມ​ສຳຄັນ​ສູງ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ຣິງໂທນ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ການແຈ້ງເຕືອນ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ໃຊ້ລະດັບສຽງໂທເຂົ້າເປັນສຽງແຈ້ງເຕືອນ"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"ສະແດງໜ້າປົກຄລິບ, ຂອບ ແລະອື່ນໆ."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"ບັງ​ຄັບ​ໃຫ້ຮູບຮ່າງຂຽນຈາກຂວາຫາຊ້າຍ"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ບັງຄັບໃຫ້ຮູບຮ່າງໜ້າຈໍ ຂຽນຈາກຂວາໄປຊ້າຍ ສຳລັບທຸກພາສາ"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"ສະແດງການນຳໃຊ້ CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"ການວາງຊ້ອນໜ້າຈໍທີ່ສະແດງການນຳໃຊ້ CPU ໃນປັດຈຸບັນ"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"ບັງຄັບໃຊ້ GPU ປະມວນພາບ"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"ຊອກຫາ"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ຊອກ​ຫາ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"​ສະ​ແດງ​ເມື່ອ​ລັອກ"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"ການ​ແຈ້ງ​ເຕືອນເນື້ອ​ຫາ​ທີ່​ລະ​ອຽດ​ອ່ອນ​ຈະ​ຖືກ​ເຊື່ອງ​ໄວ້​ໃນໜ້າ​ຈໍ​ລັອກ"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"ການ​ແຈ້ງ​ເຕືອນເນື້ອ​ຫາ​ທຸກ​ຢ່າງ​ຈະ​ຖືກ​ສະ​ແດງ​ໄວ້​ໃນ​ໜ້າ​ຈໍ​ລັອກ"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"​ການ​ລົບ​ກວນ​ຈຳ​ກັດ"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"ຕັ້ງ​ຄ່າການ​ລົບ​ກວນ​ຈຳ​ກັດ"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"ການຂັດ​ຈັງ​ຫວະ​ທີ່​ຈຳ​ກັດ"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"ສະ​ແດງ​ໃນ​ໜ້າ​ຈໍ​ລັອກ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"ເວັ້ນ​ແຕ່​ຖ້າ​ເນື້ອ​ຫາ​ລະ​ອຽດ​ອ່ອນ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"​ການ​ແຈ້ງ​ເຕືອນ​ທັງ​ໝົດ"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"ຫ້າມລົບກວນ"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"ຫ້າມລົບກວນ"</string>
     <string name="notification_settings" msgid="8342078884790733726">"ການແຈ້ງ​ເຕືອນ"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"ທົ່ວໄປ"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"ຄວາມ​ປອດ​ໄພ"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"ການປັບແຕ່ງຈຸກຈິກ"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"ແອັບຯ"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"ຕິດ​ຕັ້ງ​ແທັກ NFC ຂອງ WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"​ແ​ຕະ​ທີ່​ແທັກ​ເພື່ອ​ຂຽນ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"​ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​, ລອງ​ໃໝ່​ອີກ​ຄັ້ງ."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"ສຳເລັດແລ້ວ!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"​ບໍ່​ສາ​ມາດ​ຂຽນ​ຂໍ້​ມູນ​ໄປ​ຫາແທັກ NFC ໄດ້. ຫາກ​ບັນ​ຫາ​ນີ້​ຍັງ​ເກີດ​ຂຶ້ນ​ອີກ, ​ກະ​ລຸ​ນາ​ລອງ​ແທັກ​ອັນ​ອື່ນ​ເບິ່ງ"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"​ແທັກ NFC ແມ່ນ​ບໍ່​ສາ​ມາດ​ຂຽນ​ໄດ້​. ກະ​ລຸ​ນາ​ໃຊ້​ແທັກ​ອັນ​ອື່ນ​."</string>
+    <string name="default_sound" msgid="8821684447333687810">"​ສຽງ​ເລີ່ມ​ຕົ້ນ"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"​ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"ສະແດງການແຈ້ງເຕືອນ"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"ຄວາມ​ສຳ​ຄັນ​ສູງ"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ແລ້ວໆ"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 86ce19f..0a331e1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mob. tel. informacija:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Duomenų bandymai:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS paslauga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Tarptinklinis ryšys:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Įveskite tinklo slaptažodį."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Numatytasis pranešimo garsas"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Įspėjamieji pranešimai"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Svarbūs pranešimai iššoks"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Rod. iššok. l., jei pr. did."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Įspėjimas"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Įspėjimams naudoti gaunamų skambučių garsumą"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rodyti iškarpų ribas, kraštines ir t. t."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Išdėst. iš dešin. į kairę"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Nust. visų lokalių ekran. išdėst. iš deš. į kairę"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Energijos taupymo režimas"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Įgalinti akumuliatoriaus tausojimo nustatymus"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rodyti centr. proc. naud."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrano perdanga rodo dabartinį centr. proc. naud."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Priverst. GPU atvaizd."</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Paieška"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paieškos nustatymai"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"„Wi-Fi“ tinklo ryšys"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Rodyti, kai užrakinta"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Delikat. pran. turinys bus paslėptas užrak. ekrane"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Visų pranešimų turinys bus rodomas užrak. ekrane"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ribotos pertraukos"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfigūruoti rib. pertraukas"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ribotos pertraukos"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Rodyti užrakinimo ekraną"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Nebent turinys yra delikatus"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Visi pranešimai"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Netrukdyti"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Netrukdyti"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Pranešimai"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Bendrieji"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sauga"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Modifikacijos"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Programos"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nustatyti „Wi-Fi“ ALR žymą"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Palieskite žymą, kad galėtumėte rašyti..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Netinkamas slaptažodis, bandykite dar kartą."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Pavyko."</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Nepavyko įrašyti duomenų į ALR žymą. Jei problema išlieka, išbandykite kitą žymą"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Negalima įrašyti į ALR žymą. Naudokite kitą žymą."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Numatytasis garsas"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Rodyti pranešimus"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Didelis prioritetas"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Atlikta"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Kai įjungta, apriboti trikdžius"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Automatiškai įjungti esant miego būsenai"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefono skambučiai"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Pranešimai"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Nuo"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Bet ko"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tik kontaktų"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tik žvaigžd. pažymėtų kontaktų"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Režimu „Netrukdyti“ visada skambės perspėjimai ir laikmačiai"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Kada"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Niekada"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Kiekvieną naktį"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Savaitgalių naktimis"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Pradžios laikas"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Pabaigos laikas"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6ec3ba7..ee3c359 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Tālruņa atrašanās vietas informācija:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datu mēģinājumi:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS pakalpojums:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Viesabonēšana:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ievadiet tīkla paroli."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts.\n\nVai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Noklusējuma paziņojuma skaņa"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Brīdinājuma paziņojumi"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Tiks attēloti uznirstoši nozīmīgi paziņojumi."</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Uznirstoši (augsta prioritāte)"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Paziņojums"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Paziņojumiem izmantot ienākošā zvana skaļumu"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rādīt klipu robežas, malas utt."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Virziens no labās uz kreiso (Obligāts) WL: 295"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Obl. izkārt. virz. no labās uz kr. pusi visām lok."</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Jaudas taupīšanas režīms"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Iespējot akumulatora jaudas taupīšanu"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rādīt CPU lietojumu"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrāna pārklājums ar aktuālo CPU lietojumu"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Piespiedu GPU render."</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Meklēt"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Meklēšanas iestatījumi"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi tīkls savienojums"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Rādīt bloķēšanas ekrānā"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Bloķēšanas ekrānā netiks rādīts sensitīvs paziņojumu saturs"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Bloķēšanas ekrānā tiks rādīts viss paziņojumu saturs"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ierobežoti pārtraukumi"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfigurēt ierobežotus pārtraukumus"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ierobežoti pārtraukumi"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Rādīt bloķēšanas ekrānā"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Ja vien saturs nav sensitīvs"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Visi paziņojumi"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Netraucēt"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Netraucēt"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Paziņojumi"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Vispārīgi"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Drošība"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Uzlabojumi"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Lietotnes"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi TDLS atzīmes iestatīšana"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Pieskarieties atzīmei, lai rakstītu."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Parole nav derīga, mēģiniet vēlreiz."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Gatavs!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Nevar ierakstīt datus TDLS atzīmē. Ja problēmu neizdodas novērst, izmēģiniet citu tagu."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"TDLS atzīmē nevar ierakstīt datus. Lūdzu, izmantojiet citu atzīmi."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Noklusējuma skaņa"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Rādīt paziņojumus"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Augsta prioritāte"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gatavs"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Kad ieslēgts, var traucēt:"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Automātiski ieslēgt miega režīmā"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Tālruņa zvani"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Ziņojumi"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"No"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Ikviens"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tikai kontaktpersonas"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Atzīmētās kontaktpersonas"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Režīmā “Netraucēt” vienmēr būs dzirdami signāli un taimeri."</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Kad"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nekad"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Katru nakti"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Darbadienu naktīs"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Sākuma laiks"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Beigu laiks"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (nākamajā dienā)"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index f67c279..f7c08df 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Байршил"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Хөрш CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Үүрийн мэдээлэл:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Дата оролдлого:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS үйлчилгээ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-р хамгаалагдсан"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-р хамгаалагдсан"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Сүлжээний нууц үгээ оруулна уу."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Байхгүй"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Байршлын нарийвчлалыг сайжруулах болон бусад зорилгоор <xliff:g id="APP_NAME">%1$s</xliff:g> нь Wi-Fi хаалттай байгаа хэдий ч сүлжээний сканийг идэвхжүүлэхийг хүсч байна.\n\nҮүнийг скан хийхийг хүсч байгаа бүх апп-д зөвшөөрөх үү?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Зөвшөөрөх"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Дуугүй үед чичрэх"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Мэдэгдлийн хонхны үндсэн ая"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Анивчих мэдэгдлийн гэрэл"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Мэдэгдлүүдийг харуулах"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Чухал мэдэгдлүүд попап хийх болно"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Нэн тэргүүний ач холбогдолтой бол попап"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Хонхны ая"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Мэдэгдэл"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Ирж буй дуудлагын дууны хэмжээг мэдэгдэлд ашиглах"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Клипийн зах, хязгаар зэргийг харуулах"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL байрлалын чиглэлийг хүчээр тогтоох"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Бүх локалын хувьд дэлгэцийн байрлалын чиглэлийг хүчээр RTL болгох"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Цэнэг бага хэрэглэх горим"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Батерей хэмнэх тохиргоог идэвхжүүлэх"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU ашиглалтыг харуулах"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Дэлгэцийн давхцалаар одоогийн CPU ашиглалтыг харуулж байна"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Хүчээр GPU ашиглах"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Хайх"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Хайлтын тохиргоо"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сүлжээний холболт"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Түгжээтэй үед харуулах"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Нууц мэдэгдлүүдийн агуулга түгжээтэй дэлгэц дээр гарахгүй"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Бүх мэдэгдлийн агуулга түгжээтэй дэлгэц дээр гарах болно"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Хязгаарлагдмал тасалдалтай"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Хязгаарлагдмал тасалдлуудыг тохируулах"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Хязгаарлагдмал тасалдалтай"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Түгжигдсэн дэлгэц дээр харуулах"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Агуулга нь нууц биш бол"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Бүх мэдэгдэл"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Бүү саад бол"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Бүү саад бол"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Мэдэгдэл"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Ерөнхий"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Аюулгүй байдал"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Твик"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Апп"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC Тагийг тохируулах"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Бичихийн тулд тагь дээр дарах ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Буруу нууц үг, дахин оролдоно уу."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Амжилттай!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Датаг NFC тагь руу бичих боломжгүй. Асуудал хэвээр байвал өөр тагь ашиглаж үзнэ үү"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC тагь дээр бичих боломжгүй. Өөр тагь ашиглана уу."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Үндсэн дуу"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Мэдэгдлүүдийг харуулах"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Тэргүүний ач холбогдол"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Дууссан"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Асаасан үед тасалдлыг хязгаарлах"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Идэвхгүй үед автоматаар асаах"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Утасны дуудлага"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Зурвасууд"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Эхлэх"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Дурын хүн"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Зөвхөн харилцагчдаас"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Зөвхөн одтой харилцагчдаас"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Та Бүү саад бол горимд байхдаа ч сэрүүлэг болон сануулагчийг сонсох болно"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Хэзээ"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Хэзээ ч үгүй"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Шөнө бүр"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ажлын өдрүүдэд орой"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Эхлэх цаг"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Дуусах цаг"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Дараагийн өдрийн <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 995bf4f..00b6e4b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Info Sel:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Percubaan data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Perkhidmatan GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Perayauan:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Masukkan kata laluan rangkaian anda."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan.\n\nBenarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Bunyi pemberitahuan lalai"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Pemberitahuan Awal"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Pemberitahuan penting akan muncul"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop timbul jika keutamaan tggi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan kelantangan panggilan masuk untuk pemberitahuan"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Tunjukkan batas klip, margin dll."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paksa arah reka letak RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Paksa arah reka letak skrin RTL bg semua tpt prstwa"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Tunjukkan penggunaan CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Tindihan atas skrin menunjukkan penggunaan semasa CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa penyerahan GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Carian"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Tetapan carian"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sambungan rangkaian"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Tunjukkan apabila dikunci"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Kandungan sensitif disembunyikan pada skrin kunci"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Semua pemberitahuan ditunjukkan pada skrin kunci"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Gangguan terhad"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfigurasikan gangguan terhad"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Gangguan Terhad"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Tunjukkan pd skrin kunci"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Melainkan kandungan sensitif"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Semua pemberitahuan"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Jangan ganggu"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Jangan ganggu"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Pemberitahuan"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Umum"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Keselamatan"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Pengubah"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apl"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Sediakan Teg NFC WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketik teg untuk menulis..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Kata laluan tidak sah, cuba lagi."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Berjaya!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Tidak dapat menulis data kepada teg NFC. Jika masalah berterusan, sila cuba teg yang berbeza."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Teg NFC tidak boleh ditulis. Sila gunakan teg yang berbeza."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Bunyi lalai"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Tunjukkan pemberitahuan"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Keutamaan tinggi"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 623c107..49d41f4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celleinfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Skriv inn nettverkspassordet ditt."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standard varsellyd"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Viktige varsler"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Viktige varsler vises i forgrunnen"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Forgr.vindu for høy prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Varsel"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bruk volum for innkommende anrop også for varslinger"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis kanter, marger osv."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tving layoutretning for RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tving RTL-formgivningsretning for skjermer"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-bruk"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skjermoverlegg viser gjeldende CPU-bruk"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Tving GPU-gjengivelse"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Søk"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Søkeinnstillinger"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Vis når enheten er låst"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Sensitivt varselinnhold vises ikke på låseskjermen"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Alt varselinnhold vises på låseskjermen"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Begrensede forstyrrelser"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfig. bregrensede forstyrrelser"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Begrensede forstyrrelser"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Vis på låseskjermen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Med mindre innholdet er sensitivt"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Alle varsler"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ikke forstyrr"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ikke forstyrr"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Varsler"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Generelt"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Sikkerhet"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Finjustering"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apper"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Konfigurer NFC-brikke for Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Trykk på en brikke for å skrive"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Ugyldig passord. Prøv på nytt."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Fullført!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Kunne ikke skrive data til NFC-brikken. Prøv en annen brikke hvis problemet vedvarer"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-brikken er skrivebeskyttet. Bruk en annen brikke."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Vis varsler"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Høy prioritet"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 19fc85b..680e124 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celinfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Gegevenspogingen:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Geef uw netwerkwachtwoord op."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld.\n\nDit toestaan voor alle apps die willen scannen?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standaardmeldingsgeluid"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen meldingslampje"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Aankondigingsmeldingen"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Belangrijke meldingen verschijnen als pop-up"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up bij hoge prioriteit"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Melding"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Volume van inkomende oproepen gebruiken voor meldingen"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clipgrenzen, marges en meer weergeven."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"V.r.n.l.-indelingsrichting afdwingen"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Schermindelingsrichting geforceerd instellen op V.r.n.l. voor alle talen"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Modus laag energieverbr."</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Instellingen voor accubesparing inschakelen"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-gebruik weergeven"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Schermoverlay met huidig CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-rendering afdwingen"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Zoeken"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Zoekinstellingen"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netwerk verbinding"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Weergeven bij vergrendeld"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Inhoud van gevoelige meldingen wordt verborgen op het vergrendelingsscherm"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Inhoud van alle meldingen wordt weergegeven op het vergrendelingsscherm"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Beperkte onderbrekingen"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Beperkte onderbrekingen configureren"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Beperkte onderbrekingen"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Tonen op vergrend.scherm"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Behalve bij gevoelige inhoud"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Alle meldingen"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Niet storen"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Niet storen"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Meldingen"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Algemeen"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Beveiliging"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Aanpassingen"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Apps"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"NFC-tag voor wifi instellen"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik op een tag om te schrijven..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Ongeldig wachtwoord. Probeer het opnieuw."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Voltooid"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Kan geen gegevens schrijven naar NFC-tag. Als het probleem blijft optreden, probeert u een andere tag."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tag is niet beschrijfbaar. Gebruik een andere tag."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Standaardgeluid"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Meldingen weergeven"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hoge prioriteit"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gereed"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Als ingeschakeld: beperk verstoringen tot"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Automatisch inschakelen voor slapen"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefoonoproepen"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Berichten"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Van"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Iedereen"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Alleen contacten"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Alleen contacten met ster"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"U hoort alarmen en timers wel in de modus \'Niet storen\'"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Wanneer"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nooit"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Elke avond"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Doordeweekse avonden"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttijd"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindtijd"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ee29829..d38b574 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacje:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Próby danych:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Usługa GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Wpisz hasło do sieci."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby poprawić dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone.\n\nZezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Domyślny dźwięk powiadomienia"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Wyskakujące powiadomienia"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Ważne powiadomienia w wyskakujących okienkach"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Z okienkiem (wysoki priorytet)"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Powiadomienie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaż granice przycięcia, marginesy itd."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Wymuś układ od prawej do lewej"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Wymuś wszędzie układ ekranu od prawej do lewej"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Tryb oszczędzania baterii"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Włącz ustawienia oszczędzania baterii"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Pokaż użycie procesora"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Nakładka na ekranie pokazująca użycie procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Renderowanie na GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Szukaj"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Ustawienia wyszukiwania"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi połączenie internet"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Pokaż przy blokadzie"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Poufne informacje będą ukryte na ekranie blokady"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Cała treść będzie widoczna na ekranie blokady"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Nieliczne powiadomienia"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Skonfiguruj nieliczne powiadomienia"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Nieliczne powiadomienia"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Pokaż na ekranie blokady"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Chyba że informacje są poufne"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Wszystkie powiadomienia"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Nie przeszkadzać"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nie przeszkadzać"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Powiadomienia"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Ogólne"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Zabezpieczenia"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Dodatkowe opcje"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplikacje"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Skonfiguruj tag NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Kliknij tag, by zapisać..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Nieprawidłowe hasło. Spróbuj ponownie."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Udało się!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Nie można zapisać danych na tagu NFC. Jeśli problem nie ustąpi, użyj innego tagu"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Tag NFC nie pozwala na zapis. Użyj innego tagu."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Dźwięk domyślny"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Pokaż powiadomienia"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Wysoki priorytet"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotowe"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Po włączeniu ogranicz powiadomienia do"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Włącz automatycznie w trybie uśpienia"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefony"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Od"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Każdy"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Tylko kontakty"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Tylko kontakty z gwiazdką"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Alarmy są zawsze odtwarzane w trybie Nie przeszkadzać"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Kiedy"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nigdy"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Każdej nocy"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noce poza weekendem"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Godzina rozpoczęcia"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Godzina zakończenia"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 18cb1f06..0044eef 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Introduza a sua palavra-passe de rede."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação predefinido"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Sinalizar luz de notificação"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notificações prioritárias"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"As notificações importantes surgem num pop-up"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up se prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volume de chamadas recebidas para notificações"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Apresentar limites de clipes, margens, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forçar dir. do esq. RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forçar dir. do esq. do ecrã p. RTL tds os locais"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Modo de baixo consumo"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Ativar definições de poupança de bateria"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar utilização da CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobrep. de ecrã que mostra a utiliz. atual da CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forçar composição GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Pesquisar"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Definições de pesquisa"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ligação a rede Wi-Fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Mostrar quando bloqueado"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Os cont. de notif. confid. serão ocultados no ecrã de bloqueio"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Todos os cont. de notif. serão apres. no ecrã de bloqueio"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interrupções limitadas"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Config. interrupções limitadas"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interrupções limitadas"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Mostrar no ecrã bloqueio"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Exceto se o conteúdo for sensível"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Todas as notificações"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Não incomodar"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não incomodar"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notificações"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Geral"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Segurança"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustes"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplicações"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar etiqueta NFC para Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque numa etiqueta para escrever..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Palavra-passe inválida, tente novamente."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Êxito!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Não é possível escrever dados na etiqueta NFC. Caso o problema persista, experimente uma etiqueta diferente"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"A etiqueta NFC não é gravável. Utilize uma etiqueta diferente."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Som predefinido"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificações da aplicação"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificações"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridade alta"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Quando ativo, limitar interrupções a"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Ativar automaticamente para suspensão"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Chamadas"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"De"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Qualquer pessoa"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Apenas contactos"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Apenas contactos com estrela"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Ouvirá sempre alarmes e temporizadores com o Não incomodar"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Quando"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Todas as noites"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noites de dias úteis"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de início"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de fim"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 037536b..2b66ee1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Insira a senha da rede."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os aplicativos que quiserem verificar?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação padrão"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notificações antecipadas"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Notificações importantes em pop-up"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up para prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usar volume de chamada recebida para notificações"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar limites de corte, margens, etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forçar dir. layout (RTL)"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forçar direção do layout (RTL) p/ todas as local."</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar o uso da CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobreposição de tela que mostra o uso da CPU atual"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forçar renderização GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Pesquisar"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Configurações de pesquisa"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexão"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Mostrar ao bloquear"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Notificações confidenciais ocultas ao bloquear"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Mostrar todas as notificações na tela de bloqueio"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Interrupções limitadas"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Config. interrupções limitadas"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Interrupções limitadas"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Mostrar na tela de bloq."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Exceto para conteúdo confidencial"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Todas as notificações"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Não perturbe"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não perturbe"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Notificações"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Gerais"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Segurança"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustes"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplicativos"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar marca NFC para Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Senha inválida, tente novamente."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Sucesso!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Não foi possível gravar os dados na marca NFC. Se o problema persistir, tente outra marca."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"A marca NFC não é gravável. Use outra marca."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Som padrão"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando aplicativos…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicativos"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificações"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridade alta"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 9057949..97ff170 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1079,9 +1079,7 @@
     <!-- no translation found for notification_sound_title (5137483249425507572) -->
     <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
-    <!-- no translation found for heads_up_enabled_title (2038264257807516472) -->
-    <skip />
-    <!-- no translation found for heads_up_enabled_summary (2746343598416626372) -->
+    <!-- no translation found for heads_up_enabled_title (1031078221910921622) -->
     <skip />
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tun da scalin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Avis"</string>
@@ -2977,6 +2975,10 @@
     <skip />
     <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
     <skip />
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <!-- no translation found for show_cpu_usage (2389212910758076024) -->
     <skip />
     <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
@@ -3477,27 +3479,21 @@
     <skip />
     <!-- no translation found for keywords_wifi (8947676711698613374) -->
     <skip />
-    <!-- no translation found for lock_screen_notifications (6344441622889795466) -->
+    <!-- no translation found for lock_screen_notifications (1785930071975221150) -->
     <skip />
-    <!-- no translation found for lock_screen_notifications_summary_off (7971192950034108756) -->
+    <!-- no translation found for lock_screen_notifications_summary_off (2477642360263652408) -->
     <skip />
-    <!-- no translation found for lock_screen_notifications_summary_on (6937529984940627146) -->
+    <!-- no translation found for lock_screen_notifications_summary_on (7897541882520048340) -->
     <skip />
-    <!-- no translation found for title_zen_mode (7354258284572459398) -->
+    <!-- no translation found for title_zen_mode (4587203077066257425) -->
     <skip />
-    <!-- no translation found for configure_zen_mode_description (1234159893107156388) -->
-    <skip />
-    <!-- no translation found for zen_mode_settings_title (3709821127278518021) -->
+    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
     <skip />
     <!-- no translation found for notification_settings (8342078884790733726) -->
     <skip />
-    <!-- no translation found for notification_settings_general (6144810019102260602) -->
-    <skip />
-    <!-- no translation found for notification_settings_security (5096988798793488890) -->
-    <skip />
     <!-- no translation found for notification_settings_tweaks (659628355469765848) -->
     <skip />
-    <!-- no translation found for notification_settings_apps (4911871909798584040) -->
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
     <skip />
     <!-- no translation found for notification_app_settings_button (6685640230371477485) -->
     <skip />
@@ -3515,4 +3511,48 @@
     <skip />
     <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
     <skip />
+    <!-- no translation found for default_sound (8821684447333687810) -->
+    <skip />
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
+    <skip />
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_show (6912410502091785846) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_priority (2692156022435161791) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
+    <skip />
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
+    <skip />
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
+    <skip />
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cf2e0b2..1aec70f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informaţii celulă:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Încercări de date:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviciu GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Introduceți parola rețelei."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
@@ -703,8 +701,8 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sunet de notificare prestabilit"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos intermitent"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Notificări de avertizare"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Notif. importante afișate în ferestre pop-up"</string>
+    <!-- no translation found for heads_up_enabled_title (1031078221910921622) -->
+    <skip />
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificare"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizaţi volumul apelurilor de intrare pentru notificări"</string>
@@ -1852,6 +1850,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Direcție aspect dr. - st."</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direcție obligatorie aspect ecran dreapta - stânga"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
@@ -2103,30 +2105,70 @@
     <string name="search_menu" msgid="7053532283559077164">"Căutați"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Setări pentru căutare"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi conexiune la rețea"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Afișați pe ecran blocat"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Ascunde notificările confidențiale pe ecran blocat"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Afișează toate notificările pe ecran blocat"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Întreruperi limitate"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Config. întreruperi limitate"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Întreruperi limitate"</string>
+    <!-- no translation found for lock_screen_notifications (1785930071975221150) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (2477642360263652408) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7897541882520048340) -->
+    <skip />
+    <!-- no translation found for title_zen_mode (4587203077066257425) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
+    <skip />
     <string name="notification_settings" msgid="8342078884790733726">"Notificări"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Generale"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Securitate"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplicații"</string>
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurați eticheta NFC pentru WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Atingeți o etichetă pentru a scrie..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Parolă incorectă, încercați din nou."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Ați reușit!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Imposibil de scris date în eticheta NFC. Dacă problema persistă, încercați altă etichetă."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Eticheta NFC nu poate fi scrisă. Utilizați altă etichetă."</string>
+    <!-- no translation found for default_sound (8821684447333687810) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for app_notifications_title (5810577805218003760) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for app_notifications_dialog_show (6912410502091785846) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for app_notifications_dialog_priority (2692156022435161791) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
+    <skip />
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
+    <skip />
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
+    <skip />
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
+    <skip />
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4ceb92e..f2c4125 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Соседний CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Индекс сети:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Информация DcRt:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Попыток данных:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Услуга GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Введите пароль для подключения к сети."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен.\n\nРазрешить?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Звук уведомлений по умолчанию"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Индикатор событий"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Показывать важные оповещения"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Важные оповещения будут показаны"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Важные уведомления поверх окон"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Уведомление"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Использовать этот уровень громкости также для уведомлений"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Написание справа налево"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Включить написание справа налево для всех языков"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-ускорение"</string>
@@ -2104,30 +2105,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Поиск"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Поиск настроек"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сетевое подключение"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"На заблокированном экране"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Не показывать конфиденциальные данные"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Показывать уведомления полностью"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ограниченное число прерываний"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Ограниченное число прерываний"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ограниченное число прерываний"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"На заблокированном экране"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Не показывать конфиденциальные данные"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Показывать все уведомления"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Отключить уведомления"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Отключить уведомления"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Уведомления"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Общие"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Безопасность"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Приложения"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Настройка NFC-метки для подключения к Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Неверный пароль. Повторите попытку."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Готово"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Не удалось записать данные. Если проблема не исчезнет, выберите другую NFC-метку."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Нельзя записать данные на эту NFC-метку. Выберите другую."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Мелодия по умолчанию"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Уведомления"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Высокий приоритет"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3b8d7d3..08986cd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Informácie:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy údajov:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Zadajte heslo siete."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Predvolené zvukové upozornenie"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Upozornenia Heads Up"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Dôlež. upozor. sa zobrazia v kontext. oknách"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Prioritné v kontextovom okne"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tón zvonenia"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornenie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitosť prichádzajúcich hovorov aj pre upozornenia"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobraziť v klipe ohraničenie, okraje a pod."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Rozloženia sprava doľava"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynútiť pre všetky jazyky rozloženie obrazovky sprava doľava"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobraziť využitie CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekryvná vrstva s aktuálnym využitím procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vykresľovat pomocou GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Hľadať"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Nastavenia vyhľadávania"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sieť pripojenie"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Zobraziť na uzamk. obraz."</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Citlivé upozornenia sú na uzamk. obrazovke skryté"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Na uzamk. obrazovke sa zobrazia všetky upozornenia"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Obmedzený počet vyrušení"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Nastavenie obmedz. vyrušovania"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Obmedzené prerušenia"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Zobraz. na obraz. uzamk."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Iba obsah, ktorý nie je citlivý"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Všetky upozornenia"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Nerušiť"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nerušiť"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Upozornenia"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Všeobecné"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Zabezpečenie"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Vylepšenia"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplikácie"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia apl."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nastavenie značky NFC Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na značku začnete zápis..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Neplatné heslo, skúste to znova."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Podarilo sa!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Zápis údajov na značku NFC sa nepodaril. Ak problém pretrváva, skúste inú značku."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Na značku NFC sa nedá zapisovať. Použitie inú značku."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Predvolený zvuk"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Zobraziť upozornenia"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Vysoká priorita"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9d5eec5..637af36 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Podatki o celici:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"Diagnostične informacije:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Podatkovni poskusi:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Storitev GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Gostovanje:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Vnesite geslo za omrežje."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Privzeti zvok obvestila"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lučka za obvestila z utripanjem"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Opozorilna obvestila"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Pomembna obvestila bodo prikazana"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pojavi se, če je zelo pomembno"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obvestilo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Za obvestila uporabljaj glasnost dohodnih klicev"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaži meje obrezovanja, obrobe ipd."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vsili od desne proti levi"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vsili smer postavitve na zaslonu od desne proti levi za vse jezike"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Način nizke porabe"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Omogoči nast. varčevanja z energijo akumulatorja"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži uporabo CPE-ja"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje tren. uporabo CPE-ja"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vsili upodabljanje z GPU-jem"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Iskanje"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Nastavitve iskanja"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi omrežna povezava"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Pokaži, ko je zaklenjeno"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Občutljiva vsebina bo na zaklenjen. zaslonu skrita"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Vsa vsebina bo prikazana na zaklenjenem zaslonu"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Omejene prekinitve"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Nastavitev omejenih prekinitev"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Omejene prekinitve"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Pokaži na zakl. zaslonu"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Razen, če je vsebina občutljive narave"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Vsa obvestila"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ne moti"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne moti"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Obvestila"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Splošno"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Varnost"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Izboljšave"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Aplikacije"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nastavitev brezžične oznake NFC"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Dotaknite se oznake za zapisovanje ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Neveljavno geslo. Poskusite znova."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Uspešno."</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Na oznako NFC ni mogoče zapisati podatkov. Če težave ne odpravite, poskusite z drugo oznako."</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Na oznako NFC ni mogoče zapisovati. Uporabite drugo oznako."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Privzeti zvok"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Pokaži obvestila"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Zelo pomembno"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Končano"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Ko je vklopljeno, omeji motnje na"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Samodejni vklop za spanje"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonski klici"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Sporočila"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Od"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Vsi"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Samo stiki"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Stiki, označeni z zvezdico"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"V načinu »Ne moti« boste vedno slišali alarme in časovnike"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Kdaj"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikoli"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Vsako noč"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Noči med tednom"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Ura začetka"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Ura konca"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9fd0531..99ef953 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Локација:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседни ИД клијента:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Информације о ћелији:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Покушаји преноса података:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роминг:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Унесите лозинку за мрежу."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ништа"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Подразумевани звук обавештења"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсирајуће обавештење"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Упозорења"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Важна обавештења ће искочити"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Искаче за висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Звук звона"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Обавештење"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Користи јачину звука долазног позива за обавештења"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Прикажи границе клипа, маргине итд."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Наметни смер распореда здесна налево"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Наметни смер распореда екрана здесна налево за све локалитете"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Прик. употребу процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудни приказ пом. GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Претражите"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Подешавања претраге"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежа веза"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Прикажи када је закључано"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Осетљив садржај обавештења ће бити сакривен на закључаном екрану"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Сав садржај обавештења ће бити приказан на закључаном екрану"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ограничен број прекида"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Конфигуришите ограничене прекиде"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ограничени прекиди"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Прикажи на закљ. екрану"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Ако садржај није осетљив"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Сва обавештења"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Не узнемиравај"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не узнемиравај"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Обавештења"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Опште"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Безбедност"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Фина подешавања"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Апликације"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Подесите NFC ознаку за Wi-Fi упаривање"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Додирните ознаку да бисте писали..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Лозинка је неважећа. Покушајте поново."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Успели сте!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Није могуће писање података у NFC ознаку. Ако се проблем и даље јавља, покушајте са другом ознаком"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ознака не подржава писање. Користите другу ознаку."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Подразумевани звук"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавање апликација..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Прикажи обавештења"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Висок приоритет"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e1d4e6a..b51498b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellinfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataförsök:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjänst:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ange nätverkslösenordet."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål.\n\nVill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardljud för meddelanden"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkande ljusavisering"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Aviseringar"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Viktiga aviseringar visas"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Popupfönster vid hög prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Avisering"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Använd volymen för inkommande samtal vid avisering"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Visa gränser för videoklipp, marginaler m.m."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tvinga fram RTL-layout"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tvinga fram RTL-skärmlayout (hö–vä) för alla språk"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Energisparläge"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktivera inställningar för energisparläge"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Visa CPU-användning"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Överlägg på skärmen med aktuell CPU-användning"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Framtvinga GPU-rendering"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Sökning"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Sökinställningar"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi-nätverksanslutning"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Visa när enheten är låst"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Känsligt aviseringsinnehåll döljs på låsskärmen"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Allt aviseringsinnehåll visas på låsskärmen"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Begränsade avbrott"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Konfigurera begränsade avbrott"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Begränsade avbrott"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Visa på den låsta skärmen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Visa inte känsligt innehåll"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Alla aviseringar"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Stör ej"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Stör ej"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Aviseringar"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Allmänt"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Säkerhet"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Ändringar"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Appar"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Konfigurera en NFC-etikett för Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryck på en etikett för att skriva ..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Lösenordet är ogiltigt. Försök igen."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Klart!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Det går inte att skriva data till NFC-etiketter. Om problemet kvarstår testar du med en annan etikett"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Du kan inte skriva i NFC-etiketten. Använd en annan etikett."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Standardsignal"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Visa aviseringar"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hög prioritet"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klart"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Vid aktivering begränsas avbrott till"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Aktiveras automatiskt i viloläge"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonsamtal"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Meddelanden"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Från"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Vem som helst"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Endast kontakter"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Endast stjärnmärkta kontakter"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Alarm och timer hörs alltid i läget Stör ej"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"När"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Varje kväll"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Veckodagskvällar"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttid"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttid"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fdd9edb..7bdb97f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -209,8 +209,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Mahali:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ya ujirani:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Maelezo ya Simu:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Majaribio ya data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Huduma ya GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"urandaji:"</string>
@@ -622,8 +621,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ingiza nenosiri la mtandao wako."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa.\n\nJe, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
@@ -695,8 +693,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sauti chaguo-msingi ya arifa"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Arifa za Tahadhari"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Arifa muhimu zitaibuka"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Tumia ibukizi kama ni kipaumbele cha kwanza"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Mlio wa simu"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Arifa"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Tumia sauti ya simu inayoingia kwa arifa"</string>
@@ -1845,6 +1842,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Onyesha mipaka ya picha, kingo, nk."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Lazimisha uelekezaji wa muundo wa RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Lazimisha uelekezaji wa muundo wa skrini kwa RTL kwa lugha zote"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Onyesha matumizi ya CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza  GPU"</string>
@@ -2096,30 +2097,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Utafutaji"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Mipangilio ya utafutaji"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"muunganisho wa mtandao wa wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Onyesha wakati imefungwa"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Arifa za maudhui nyeti zitafichwa kwenye skrini iliyofungwa"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Arifa za maudhui yote zitaonyeshwa kwenye skrini iliyofungwa"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Ukatizwaji mdogo"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Sanidi ukatizwaji mdogo"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Ukatizwaji mdogo"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Onyesha kwenye skrini iliyofungwa"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Isipokuwa kama maudhui ni nyeti"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Arifa zote"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Usisumbue"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Usisumbue"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Arifa"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Jumla"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Usalama"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Marekebisho"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Programu"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Sanidi tagi ya NFC ya WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Gonga tagi ya NFC ili uandike..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Nenosiri si sahihi, jaribu tena."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Imefanikiwa!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Tagi ya NFC haiandikiki. Tafadhali tumia tagi tofauti."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Sauti chaguo-msingi"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Onyesha arifa"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Kipaumbele cha kwanza"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Imemaliza"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a15252c..57ae958 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ตำแหน่ง:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ใกล้เคียง:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ข้อมูลเซลล์:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ความพยายามใช้ข้อมูล:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"บริการ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"โรมมิ่ง:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">" ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"ป้อนรหัสผ่านเครือข่ายของคุณ"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ไม่มี"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi \n \n อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"สั่นเตือนเมื่อปิดเสียง"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"เสียงแจ้งเตือนเริ่มต้น"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ไฟแจ้งเตือนพัลซ์"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"การแจ้งเตือนล่วงหน้า"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"การแจ้งเตือนสำคัญจะแสดงเป็นป๊อปอัป"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"แสดงป๊อปอัปเมื่อมีความสำคัญมาก"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"เสียงเรียกเข้า"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"การแจ้งเตือน"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ใช้ระดับเสียงของสายเรียกเข้าเพื่อแจ้งเตือน"</string>
@@ -1185,7 +1182,7 @@
     <string name="security_settings_billing_desc" msgid="8061019011821282358">"แอปพลิเคชันนี้อาจมีการเรียกเก็บเงิน:"</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ส่ง SMS พรีเมียม"</string>
     <string name="computing_size" msgid="1599186977475211186">"กำลังคำนวณ..."</string>
-    <string name="invalid_size_value" msgid="7563537715280712285">"คำนวณขนาดแพคเกจไม่ได้"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"คำนวณขนาดแพ็กเกจไม่ได้"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"คุณไม่ได้ติดตั้งแอปพลิเคชันของบุคคลที่สามไว้เลย"</string>
     <string name="version_text" msgid="9189073826278676425">"เวอร์ชันของ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ย้าย"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"บังคับทิศทางการจัดวาง RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"บังคับทิศทางการจัดวางหน้าจอเป็น RTL สำหรับทุกภาษา"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"โหมดใช้พลังงานต่ำ"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"เปิดใช้การตั้งค่าประหยัดแบตเตอรี่"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"แสดงการใช้ CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"เร่งการแสดงผลของ GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"ค้นหา"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"การตั้งค่าการค้นหา"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"การเชื่อมต่อเครือข่าย wifi wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"แสดงเมื่อล็อก"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"เนื้อหาการแจ้งเตือนที่ละเอียดอ่อนจะถูกซ่อนไม่ให้แสดงบนหน้าจอล็อก"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"เนื้อหาการแจ้งเตือนทั้งหมดจะแสดงบนหน้าจอล็อก"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"การรบกวนที่จำกัด"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"กำหนดค่าการรบกวนที่จำกัด"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"การรบกวนที่จำกัด"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"แสดงบนหน้าจอล็อก"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"ยกเว้นเนื้อหาที่มีความละเอียดอ่อน"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"การแจ้งเตือนทั้งหมด"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"ห้ามรบกวน"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"ห้ามรบกวน"</string>
     <string name="notification_settings" msgid="8342078884790733726">"การแจ้งเตือน"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"ทั่วไป"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"ความปลอดภัย"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"ปรับแต่ง"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"แอป"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"ตั้งค่าแท็ก WiFi NFC"</string>
+    <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"แตะแท็กเพื่อเขียน..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"รหัสผ่านไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"สำเร็จ!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"ไม่สามารถเขียนข้อมูลลงแท็ก NFC ได้ หากยังคงมีปัญหา โปรดลองใช้แท็กอื่น"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"แท็ก NFC ไม่สามารถเขียนได้ โปรดใช้แท็กอื่น"</string>
+    <string name="default_sound" msgid="8821684447333687810">"เสียงเริ่มต้น"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"แสดงการแจ้งเตือน"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"มีความสำคัญมาก"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"เสร็จ"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"เมื่อเปิด จะจำกัดการรบกวนเป็น"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"เปิดโดยอัตโนมัติสำหรับนอนหลับ"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"การโทรศัพท์"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"ข้อความ"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"จาก"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"ใครก็ได้"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"เฉพาะรายชื่อติดต่อ"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"เฉพาะรายชื่อติดต่อที่ติดดาว"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"คุณจะได้ยินเสียงปลุกและตัวจับเวลาเสมอในโหมดห้ามรบกวน"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"เวลา"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"ไม่ใช้"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ทุกคืน"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"คืนวันจันทร์-ศุกร์"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"เวลาเริ่มต้น"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"เวลาสิ้นสุด"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ของวันถัดไป"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b9d7526..7cd5e48 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Mga pagtatangka ng data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serbisyong GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ilagay ang iyong password sa network."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi.\n\nPayagan ito para sa lahat ng apps na gustong mag-scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default na tunog ng notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Mga Heads Up na Notification"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Magpa-pop up ang mahahalagang notification"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up kung mataas priyoridad"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gumamit ng lakas ng tunog ng papasok na tawag para sa mga notification"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Ipakita ang mga hangganan ng clip, margin, atbp."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout dir."</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout dir. sa RTL sa lahat ng lokal"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Ipakita paggamit ng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay ng screen pakita paggamit ngayon ng CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Ipilit ang pag-render ng GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Maghanap"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Mga setting ng paghahanap"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Ipakita kapag naka-lock"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Itatago ang mga sensitibong nilalaman ng notification sa lock screen"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Ipapakita ang lahat ng nilalaman ng notification sa lock screen"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Mga limitadong pagkaantala"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"I-configure ang mga limitadong pagkaantala"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Mga Limitadong Pagkagambala"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Ipakita sa lock screen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Maliban kung sensitibo ang nilalaman"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Lahat ng notification"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Huwag istorbohin"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Huwag istorbohin"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Mga Notification"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Pangkalahatan"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Seguridad"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Mga Pagbabago"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Mga App"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"I-set up ang Tag ng NFC ng WiFi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Mag-tap ng tag upang magsulat..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Di-wastong password, subukang muli."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Tagumpay!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Hindi makapagsulat ng data sa tag ng NFC. Kung magpapatuloy ang problema, sumubok ng ibang tag"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Hindi nasusulatan ang tag ng NFC. Mangyaring gumamit ng ibang tag."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Default na tunog"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Mga notification sa app"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Magpakita ng mga notification"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Mataas na priyoridad"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tapos na"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9151ced..6efb0ea 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Hücre Bilgileri:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Veri giriş denemeleri:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS hizmeti:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Dolaşım:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ağ şifrenizi girin."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Varsayılan bildirim sesi"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Uyarı Bildirimleri"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Önemli bildirimler görüntülenecek"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Yüksek öncelikliyse pop-up kullan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Bildirim"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bildirimlerde gelen çağrı ses düzeyini kullan"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Klip sınırlarını, kenar boşluklarını vb. göster"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Sağdan sola düzenini zorla"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tüm yerel ayarlar için sağdan sola ekran düzenini zorlar"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU kullanımını göster"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mevcut CPU kullanımını gösteren yer paylaşımı"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU oluşturmayı zorla"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Arama yapın"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Arama ayarları"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi kablosuz ağ bağlantısı"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Kilitlendiğinde göster"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Hassas bildirim içeriği kilit ekranında gizlenecek"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Tüm bildirim içerikleri kilit ekranında gizlenecek"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Sınırlı kesilmeler"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Sınırlı kesilmeleri yapılandır"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Sınırlı Kesilmeler"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Kilit ekranında göster"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"İçerik hassas değilse"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Tüm bildirimler"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Rahatsız etmeyin"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Rahatsız etmeyin"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Bildirimler"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Genel"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Güvenlik"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"İnce ayarlar"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Uygulamalar"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Kablosuz NFC Etiketi Oluştur"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete hafifçe vurun..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Geçersiz şifre. Tekrar deneyin."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Başarıyla yazıldı!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC etiketine veri yazılamıyor. Sorun devam ederse başka bir etiket deneyin"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC etiketine yazılamıyor. Lütfen farklı bir etiket kullanın."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Varsayılan ses"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Bildirimleri göster"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Yüksek öncelik"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tamam"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8773c55..eb4c9d4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Місцезнах.:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Сусідній CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Інформація про телефон:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спроб даних:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роумінг:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Введіть пароль своєї мережі."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Немає"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібр. в беззвуч. реж."</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Звук сповіщення за умовчанням"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Блим. світл. сигн. сповіщ."</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Важливі сповіщення"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Важливі сповіщення з’являтимуться на екрані"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Важливі сповіщення поверх вікон"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодія"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Сповіщення"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Викор. гучність вхідних дзвінків для сповіщень"</string>
@@ -1851,6 +1848,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показувати межі роликів, поля тощо"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Макет письма справа наліво"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Застосовувати макет письма справа наліво для всіх мов"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Енергоекономний режим"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Увімкнути налаштування економії заряду акумулятора"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показати використання ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Примусова візуалізація GPU"</string>
@@ -2102,30 +2101,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Пошук"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Налаштуваня пошуку"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Показ під час блокування"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Конфіденційний вміст не видно на екрані блокування"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Весь вміст сповіщень видно на екрані блокування"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Обмежені перешкоди"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Налаштувати обмежені перешкоди"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Обмежені перешкоди"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Див. на екрані блокування"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Окрім конфіденційного вмісту"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Усі сповіщення"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Не турбувати"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не турбувати"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Сповіщення"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Загальні"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Безпека"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Налаштування"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Додатки"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Налаштувати NFC-тег Wi-Fi"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Торкніться тегу, у який потрібно записати дані…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Недійсний пароль. Повторіть спробу."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Готово"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Не вдалося записати дані в NFC-тег. Якщо проблема не зникне, виберіть інший тег"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"У цей NFC-тег не можна записувати дані. Виберіть інший."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Звук за умовчанням"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Показувати сповіщення"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Високий пріоритет"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Максимум перешкод, коли ввімкнено:"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Автоматично вмикати в режимі сну"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Телефонні дзвінки"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Повідомлення"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Від"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Усі"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Лише контакти"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Лише позначені контакти"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"У режимі \"Не турбувати\" ви завжди чутимете сигнали й таймер"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Коли:"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"ніколи"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"щовечора"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"увечері в робочі дні"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Час початку"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Час завершення"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 07aea08..cb7edae 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Nỗ lực dữ liệu:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Dịch vụ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Chuyển vùng:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Nhập mật khẩu mạng của bạn."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Không"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt.\n\nCho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Âm thanh thông báo mặc định"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Đèn thông báo dạng xung"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Thông báo lưu ý"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Thông báo quan trọng sẽ bật lên"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Bật lên nếu mức độ ưu tiên cao"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Thông báo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sử dụng âm lượng cuộc gọi đến cho thông báo"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Hiển thị viền đoạn video, lề, v.v.."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Buộc hướng bố cục RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Buộc hướng bố cục màn hình RTL cho tất cả ngôn ngữ"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Lớp phủ màn hình hiển thị mức sử dụng CPU hiện tại"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Bắt buộc kết xuất GPU"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"Tìm kiếm"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Cài đặt tìm kiếm"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi kết nối mạng"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Hiển thị khi bị khóa"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Nội dung thông báo nhạy cảm sẽ bị ẩn trên màn hình khóa"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Tất cả nội dung thông báo sẽ được hiển thị trên màn hình khóa"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Gián đoạn hạn chế"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Định cấu hình các gián đoạn hạn chế"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Gián đoạn hạn chế"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Hiển thị trên màn hình khóa"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Trừ khi nội dung là nhạy cảm"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Tất cả thông báo"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Đừng làm phiền"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Đừng làm phiền"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Thông báo"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Chung"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Bảo mật"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Chỉnh sửa"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Ứng dụng"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Thiết lập thẻ WiFi NFC"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Nhấn vào một thẻ để ghi..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Mật khẩu không hợp lệ, hãy thử lại."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Thành công!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Không thể ghi dữ liệu vào thẻ NFC. Nếu sự cố tiếp diễn, hãy thử một thẻ khác"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Thẻ NFC không thể ghi được. Vui lòng sử dụng một thẻ khác."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Âm thanh mặc định"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Hiện thông báo"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Mức độ ưu tiên cao"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Xong"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fb4ffe7..2aa7aa9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"地点："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"小区信息："</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数："</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服务："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫游："</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"请输入您的网络密码。"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"无"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了 WLAN  时也可进行扫描）。\n\n是否对所有需要进行扫描的应用批准这项请求？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"默认通知提示音"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"收到通知时指示灯闪烁"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"弹出式通知"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"重要通知会自动弹出"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"弹出显示高优先级的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"将来电音量用作通知音量"</string>
@@ -1851,6 +1848,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"强制使用从右到左的布局方向"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"强制将所有语言区域的屏幕布局方向改为从右到左"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"强制进行 GPU 渲染"</string>
@@ -2102,30 +2103,58 @@
     <string name="search_menu" msgid="7053532283559077164">"搜索"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"搜索设置"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"WLAN网络连接"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"锁定时显示"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"敏感的通知内容将会在锁定屏幕上隐藏"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"所有通知内容均将在锁定屏幕上显示"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"有限打扰"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"配置有限打扰"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"有限打扰"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"在锁定屏幕上显示"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"敏感内容除外"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"所有通知"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"勿打扰"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿打扰"</string>
     <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"常规"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"安全"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"调整"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"应用"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"设置WLAN NFC标签"</string>
+    <string name="write_tag" msgid="8571858602896222537">"写入"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"密码无效，请重试。"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"成功！"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"无法将数据写入NFC标签。如果该问题一直存在，请尝试使用其他标签"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"无法将数据写入NFC标签，请使用其他标签。"</string>
+    <string name="default_sound" msgid="8821684447333687810">"默认铃声"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"显示通知"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"高优先级"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index be0bf90..928598e 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"手機資訊："</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo："</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"資料嘗試次數："</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服務："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊："</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"以 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 保護連線安全性"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，以 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 保護連線安全性"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"輸入您的網絡密碼。"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃瞄功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃瞄的應用程式這項要求嗎？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"帶頭通知"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"彈出重要通知"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"彈出顯示高度優先的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音量與來電音量相同"</string>
@@ -1855,6 +1852,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"強制使用從右至左的版面配置方向"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"強制將所有語言代碼的畫面配置方向改為從右至左"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"低耗電量模式"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"啟用節約電池用量設定"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在屏幕上重疊顯示目前的 CPU 使用量"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
@@ -2106,30 +2105,42 @@
     <string name="search_menu" msgid="7053532283559077164">"搜尋"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"搜尋設定"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"WiFi Wi-Fi 網絡連線"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"上鎖時顯示"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"上鎖畫面中會隱藏敏感通知內容"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"上鎖畫面會顯示所有通知內容"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"有限度干擾"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"設定限制干擾"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"有限度干擾"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"在上鎖畫面上顯示"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"敏感內容除外"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"所有通知"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"請勿干擾"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"請勿干擾"</string>
     <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"一般"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"安全性"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"調整"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"應用程式"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"設定 Wi-Fi NFC 標籤"</string>
+    <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標籤即可寫入…"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"密碼無效，請再試一次。"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"大功告成！"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"無法將資料寫入 NFC 標籤。如果問題仍然持續，請嘗試使用其他標籤"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標籤，請使用其他標籤。"</string>
+    <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"顯示通知"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"高度優先"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"開啟時，限制干擾時段："</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"休眠時自動開啟"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"通話"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"由"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"所有人"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"只限聯絡人"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"只限已加星號的聯絡人"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"「請勿打擾」一律會播放鬧鐘和計時器音效"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"時間"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"永不"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"每天晚上"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"星期一至星期五晚"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"完結時間"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"下一天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4782b3b..eb6c21c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"儲存格資訊："</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"DcRtInfo："</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"嘗試資料："</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服務："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊："</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"輸入您的網路密碼。"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n您要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"提醒通知"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"彈出顯示重要通知"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"彈出顯示高優先順序的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音量與來電音量相同"</string>
@@ -1855,6 +1852,10 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等。"</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"強制使用從右至左版面配置方向"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"強制將所有語言代碼的畫面配置方向改為從右至左"</string>
+    <!-- no translation found for low_power_mode (8400119155107987979) -->
+    <skip />
+    <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上方顯示目前的 CPU 使用量"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
@@ -2106,30 +2107,58 @@
     <string name="search_menu" msgid="7053532283559077164">"搜尋"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"搜尋設定"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi 網路連線"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"鎖定時顯示"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"鎖定畫面中不會顯示機密通知內容"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"鎖定畫面會顯示所有通知內容"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"限制干擾"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"設定限制干擾"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"限制干擾"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"顯示在鎖定畫面上"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"機密內容除外"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"所有通知"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"勿干擾"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿干擾"</string>
     <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"一般設定"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"安全性"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"調整"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"應用程式"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"設定 WiFi NFC 標記"</string>
+    <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標記即可寫入..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"密碼無效，請再試一次。"</string>
+    <string name="status_write_success" msgid="5228419086308251169">"成功！"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"無法將資料寫入 NFC 標記。如果問題持續發生，請嘗試使用其他標記"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標記，請使用其他標記。"</string>
+    <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"顯示通知"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"高優先順序"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
+    <!-- no translation found for zen_mode_general_category (8665291516524965729) -->
     <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
+    <!-- no translation found for zen_mode_automatic_category (7178632613181667490) -->
     <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
+    <!-- no translation found for zen_mode_phone_calls (2872774457193013585) -->
     <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
+    <!-- no translation found for zen_mode_messages (5886440273537510894) -->
     <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
+    <!-- no translation found for zen_mode_from (1777739391289980762) -->
     <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
+    <!-- no translation found for zen_mode_from_anyone (1180865188673992959) -->
     <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
+    <!-- no translation found for zen_mode_from_contacts (8751503728985572786) -->
+    <skip />
+    <!-- no translation found for zen_mode_from_starred (2168651127340381533) -->
+    <skip />
+    <!-- no translation found for zen_mode_alarm_info (6618710483408892326) -->
+    <skip />
+    <!-- no translation found for zen_mode_when (208441657907932773) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_never (8809494351918405602) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_every_night (3122486110091921009) -->
+    <skip />
+    <!-- no translation found for zen_mode_when_weeknights (8354070633893273783) -->
+    <skip />
+    <!-- no translation found for zen_mode_start_time (8102602297273744441) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time (8774327885892705505) -->
+    <skip />
+    <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index de5745d..461feb3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -207,8 +207,7 @@
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Indawo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"I-CID Yokwakhelana:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Ulwazi leseli:"</string>
-    <!-- no translation found for radio_info_dcrtinfo_label (6802395441317448068) -->
-    <skip />
+    <string name="radio_info_dcrtinfo_label" msgid="6802395441317448068">"I-DcRtInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Imizamo yedatha:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Iseva ye-GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ukuzulazula:"</string>
@@ -630,8 +629,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
-    <skip />
+    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Faka iphasiwedi yakho yenethiwekhi."</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
@@ -703,8 +701,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Umsindo wokwazisa ozenzakalelayo"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</string>
-    <string name="heads_up_enabled_title" msgid="2038264257807516472">"Izaziso ezikwazisa ngokusha"</string>
-    <string name="heads_up_enabled_summary" msgid="2746343598416626372">"Izaziso ezibalulekile zizovela"</string>
+    <string name="heads_up_enabled_title" msgid="1031078221910921622">"Vela uma kubalulekile"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Iringithoni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Isaziso"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sebenzisa ivolumu yocingo olungenayo yezaziso"</string>
@@ -1858,6 +1855,8 @@
     <string name="debug_layout_summary" msgid="2001775315258637682">"Bonisa imikhawulo, imiphetho, njll, yesiqeshana."</string>
     <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Phoqelela isikhombisi-ndlela sesakhiwo se-RTL"</string>
     <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Phoqelela isikhombisi-ndlela sesikrini ku-RTL kuzo zonke izifunda"</string>
+    <string name="low_power_mode" msgid="8400119155107987979">"Imodi Yamandla Aphansi"</string>
+    <string name="low_power_mode_summary" msgid="8895619424568660204">"Nika amandla izilungiselelo zokulondoloza ibhethri"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Bonisa ukusebenzisa i-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Imbondela yesikrini ibonisa ukusetshenziswa kwe-CPU okwamanje"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Phoqa ukunikeza i-GPU"</string>
@@ -2109,30 +2108,42 @@
     <string name="search_menu" msgid="7053532283559077164">"Sesha"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Izilungiselelo zokusesha"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ukuxhumeka kwenethiwekhi ye-wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="6344441622889795466">"Bonisa uma ivaliwe"</string>
-    <string name="lock_screen_notifications_summary_off" msgid="7971192950034108756">"Okuqukethwe kwezaziso ezizwelayo kuzofihlwa esikrinini sokukhiya"</string>
-    <string name="lock_screen_notifications_summary_on" msgid="6937529984940627146">"Konke okuqukethwe kwesaziso kuzoboniswa esikrinini sokukhiya"</string>
-    <string name="title_zen_mode" msgid="7354258284572459398">"Iziphazamiso ezinomkhawulo"</string>
-    <string name="configure_zen_mode_description" msgid="1234159893107156388">"Lungiselela iziphazamiso ezikhawulelwe"</string>
-    <string name="zen_mode_settings_title" msgid="3709821127278518021">"Iziphazamiso ezinomkhawulo"</string>
+    <string name="lock_screen_notifications" msgid="1785930071975221150">"Bonisa kusikrini sokukhiya"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="2477642360263652408">"Ngaphandle kwalapho okuqukethwe kuzwela"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7897541882520048340">"Zonke izaziso"</string>
+    <string name="title_zen_mode" msgid="4587203077066257425">"Ungaphazamisi"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ungaphazamisi"</string>
     <string name="notification_settings" msgid="8342078884790733726">"Izaziso"</string>
-    <string name="notification_settings_general" msgid="6144810019102260602">"Okujwayelekile"</string>
-    <string name="notification_settings_security" msgid="5096988798793488890">"Ukuphepha"</string>
     <string name="notification_settings_tweaks" msgid="659628355469765848">"Amathwikhi"</string>
-    <string name="notification_settings_apps" msgid="4911871909798584040">"Izinhlelo zokusebenza"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
-    <skip />
-    <!-- no translation found for write_tag (8571858602896222537) -->
-    <skip />
-    <!-- no translation found for status_awaiting_tap (2130145523773160617) -->
-    <skip />
-    <!-- no translation found for status_invalid_password (2575271864572897406) -->
-    <skip />
-    <!-- no translation found for status_write_success (5228419086308251169) -->
-    <skip />
-    <!-- no translation found for status_failed_to_write (8072752734686294718) -->
-    <skip />
-    <!-- no translation found for status_tag_not_writable (2511611539977682175) -->
-    <skip />
+    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Setha umaki wei-WiFi NFC"</string>
+    <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Thepha umaki ukuze ubhale..."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"Iphasiwedi elingalungile, zama futhi."</string>
+    <string name="status_write_success" msgid="5228419086308251169">"Impumelelo!"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"Ayikwazi ukubhala idatha kumaki we-NFC. Uma inkinga iqhubeka, zama umaki owehlukile"</string>
+    <string name="status_tag_not_writable" msgid="2511611539977682175">"Umaki we-NFC akabhaleki. Sicela usebenzise umaki owehlukile."</string>
+    <string name="default_sound" msgid="8821684447333687810">"Umsindo owufica ukhona"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
+    <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Bonisa izaziso"</string>
+    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Okubaluleke kakhulu"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kwenziwe"</string>
+    <string name="zen_mode_general_category" msgid="8665291516524965729">"Uma ivuliwe, khawulela iziphazamiso ku-"</string>
+    <string name="zen_mode_automatic_category" msgid="7178632613181667490">"Yivule ngokuzenzakalela ekulaleni"</string>
+    <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Amakholi efoni"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Imilayezo"</string>
+    <string name="zen_mode_from" msgid="1777739391289980762">"Isuka ku-"</string>
+    <string name="zen_mode_from_anyone" msgid="1180865188673992959">"Noma ubani"</string>
+    <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Oxhumana nabo kuphela"</string>
+    <string name="zen_mode_from_starred" msgid="2168651127340381533">"Oxhumana nabo abafakwe izinkanyezi kuphela"</string>
+    <string name="zen_mode_alarm_info" msgid="6618710483408892326">"Uzohlala uzwa ama-alamu nezinto zesikhathi Ekungaphazamisini"</string>
+    <string name="zen_mode_when" msgid="208441657907932773">"Nini"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"Akusoze"</string>
+    <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Njalo ngobusuku"</string>
+    <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Ubusuku baphakathi neviki"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"Isikhathi sokuqala"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"Isikhathi sokugcina"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> usuku olulandelayo"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fcbf46b..acbccaa 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -46,6 +46,8 @@
     <color name="circle_avatar_frame_shadow_color">#80000000</color>
     <color name="circle_avatar_frame_pressed_color">#ffffffff</color>
 
+    <color name="lock_pattern_background">#8000</color>
+
     <color name="quantum_blue_grey_50">#ffeceff1</color>
     <color name="quantum_blue_grey_100">#ffcfd8dc</color>
     <color name="quantum_blue_grey_300">#ff90a4ae</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 64d4851..8188164 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -83,4 +83,5 @@
     <dimen name="notification_app_icon_badge_size">20dp</dimen>
     <dimen name="notification_app_icon_badge_margin">4dp</dimen>
     <dimen name="notification_app_settings_divider_height">48dp</dimen>
+    <dimen name="zen_mode_dropdown_width">160dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b83dd7a..18ec5f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3868,7 +3868,7 @@
     <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
     <string name="tts_default_sample_string">This is an example of speech synthesis</string>
     <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
-	 current default language [CHAR LIMIT=50] -->
+         current default language [CHAR LIMIT=50] -->
     <string name="tts_status_title">Default language status</string>
     <!-- On main TTS Settings screen, current TTS engine status for the current default language,
          selected language is fully supported by the engine [CHAR LIMIT=150]-->
@@ -3880,7 +3880,7 @@
          selected language is not supported by the engine [CHAR LIMIT=150] -->
     <string name="tts_status_not_supported"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is not supported</string>
     <!-- On main TTS Settings screen, current TTS engine status for the current default language,
-	 tts engine is queried for status [CHAR LIMIT=150] -->
+         tts engine is queried for status [CHAR LIMIT=150] -->
     <string name="tts_status_checking">Checking...</string>
     <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
     <string name="tts_engines_section">Engines</string>
@@ -4421,6 +4421,11 @@
     <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
     <string name="force_rtl_layout_all_locales_summary">Force screen layout direction to RTL for all locales</string>
 
+    <!-- UI debug setting: start low power mode [CHAR LIMIT=25] -->
+    <string name="low_power_mode">Low Power Mode</string>
+    <!-- UI debug setting: start low power mode summary[CHAR LIMIT=50] -->
+    <string name="low_power_mode_summary">Enable battery saving settings</string>
+
     <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
     <string name="show_cpu_usage">Show CPU usage</string>
     <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
@@ -4774,6 +4779,10 @@
     <string name="user_add_user_menu">Add user or profile</string>
     <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
     <string name="user_summary_restricted_profile">Restricted profile</string>
+    <!-- User settings summary for a managed profile [CHAR LIMIT=50] -->
+    <string name="user_summary_managed_profile">Managed profile</string>
+    <!-- User settings summary for an inactive managed profile [CHAR LIMIT=50] -->
+    <string name="user_summary_managed_profile_not_enabled">Managed profile (currently inactive)</string>
     <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
     <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
     <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
@@ -4782,6 +4791,8 @@
     <string name="user_summary_not_set_up">Not set up</string>
     <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
     <string name="user_summary_restricted_not_set_up">Not set up - Restricted profile</string>
+    <!-- User summary to indicate that a managed profile is currently not set up [CHAR LIMIT=100] -->
+    <string name="user_summary_managed_profile_not_set_up">Not set up - Managed profile</string>
     <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
     <string name="user_owner">Owner</string>
     <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
@@ -5030,15 +5041,15 @@
     <!-- Notifications on lockscreen -->
     <!-- Label for checkbox controlling the contents of notifications shown on
          the secure lockscreen [CHAR LIMIT=25] -->
-    <string name="lock_screen_notifications">Show on lock screen</string>
+    <string name="lock_screen_notifications">When device is locked</string>
     <!-- Summary for lock_screen_notifications: sensitive information will be
          hidden or redacted from notifications shown on a secure lock screen
          [CHAR LIMIT=50] -->
-    <string name="lock_screen_notifications_summary_off">Unless content is sensitive</string>
+    <string name="lock_screen_notifications_summary_hide">Hide sensitive notification content</string>
     <!-- Summary for lock_screen_notifications: all information will be
          shown in notifications shown on a secure lock screen
          [CHAR LIMIT=50] -->
-    <string name="lock_screen_notifications_summary_on">All notifications</string>
+    <string name="lock_screen_notifications_summary_show">Show all notification content</string>
 
     <!-- [CHAR LIMIT=30] Notification settings screen, setting option name -->
     <string name="title_zen_mode">Do not disturb</string>
@@ -5094,4 +5105,52 @@
 
     <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
     <string name="app_notifications_dialog_done">Done</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: General category text -->
+    <string name="zen_mode_general_category">When on, limit interruptions to</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: Automatic category text -->
+    <string name="zen_mode_automatic_category">Automatically turn on for sleep</string>
+
+     <!-- [CHAR LIMIT=20] Zen mode settings: Phone calls option -->
+    <string name="zen_mode_phone_calls">Phone calls</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+    <string name="zen_mode_messages">Messages</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: From option -->
+    <string name="zen_mode_from">From</string>
+
+    <!-- [CHAR LIMIT=30] Zen mode settings: From option value: Anyone -->
+    <string name="zen_mode_from_anyone">Anyone</string>
+
+    <!-- [CHAR LIMIT=30] Zen mode settings: From option value: Contacts -->
+    <string name="zen_mode_from_contacts">Contacts only</string>
+
+    <!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
+    <string name="zen_mode_from_starred">Starred contacts only</string>
+
+    <!-- [CHAR LIMIT=60] Zen mode settings: Reminder text about alarms -->
+    <string name="zen_mode_alarm_info">You&#8217;ll always hear alarms and timers in Do not disturb</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+    <string name="zen_mode_when">When</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+    <string name="zen_mode_when_never">Never</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+    <string name="zen_mode_when_every_night">Every night</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+    <string name="zen_mode_when_weeknights">Weeknights</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+    <string name="zen_mode_start_time">Start time</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+    <string name="zen_mode_end_time">End time</string>
+
+    <!-- [CHAR LIMIT=20] Zen mode settings: End time option: Summary text value format -->
+    <string name="zen_mode_end_time_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
 </resources>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 2a9e125..e9aeae8 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -241,6 +241,11 @@
             android:summary="@string/strict_mode_summary"/>
 
         <CheckBoxPreference
+            android:key="low_power_mode"
+            android:title="@string/low_power_mode"
+            android:summary="@string/low_power_mode_summary"/>
+
+        <CheckBoxPreference
             android:key="show_cpu_usage"
             android:title="@string/show_cpu_usage"
             android:summary="@string/show_cpu_usage_summary"/>
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index 51b153e..8cc1069 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -36,11 +36,9 @@
             android:title="@string/heads_up_enabled_title"
             android:persistent="false" />
 
-    <CheckBoxPreference
+    <com.android.settings.notification.DropDownPreference
             android:key="toggle_lock_screen_notifications"
             android:title="@string/lock_screen_notifications"
-            android:summaryOff="@string/lock_screen_notifications_summary_off"
-            android:summaryOn="@string/lock_screen_notifications_summary_on"
             android:persistent="false" />
 
     <PreferenceScreen
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 474eeb9..bf1523e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -23,9 +23,10 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <com.android.settings.SmsListPreference
+    <com.android.settings.AppListPreference
         android:key="sms_application"
         android:title="@string/sms_application_title"
+        android:summary="%s"
         android:persistent="false" />
 
     <CheckBoxPreference
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
new file mode 100644
index 0000000..0a7a519
--- /dev/null
+++ b/res/xml/zen_mode_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="zen_mode_settings"
+    android:title="@string/zen_mode_settings_title" >
+
+    <PreferenceCategory
+        android:key="general"
+        android:layout="@layout/notification_app_section"
+        android:title="@string/zen_mode_general_category" >
+        <SwitchPreference
+            android:key="phone_calls"
+            android:persistent="false"
+            android:switchTextOff=""
+            android:switchTextOn=""
+            android:title="@string/zen_mode_phone_calls" />
+        <SwitchPreference
+            android:key="messages"
+            android:persistent="false"
+            android:switchTextOff=""
+            android:switchTextOn=""
+            android:title="@string/zen_mode_messages" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="automatic"
+        android:layout="@layout/notification_app_section"
+        android:title="@string/zen_mode_automatic_category" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java
new file mode 100644
index 0000000..919720f
--- /dev/null
+++ b/src/com/android/settings/AppListPreference.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.drawable.Drawable;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+
+/**
+ * Extends ListPreference to allow us to show the icons for a given list of applications. We do this
+ * because the names of applications are very similar and the user may not be able to determine what
+ * app they are selecting without an icon.
+ */
+public class AppListPreference extends ListPreference {
+    private Drawable[] mEntryDrawables;
+
+    public class AppArrayAdapter extends ArrayAdapter<CharSequence> {
+        private Drawable[] mImageDrawables = null;
+        private int mSelectedIndex = 0;
+
+        public AppArrayAdapter(Context context, int textViewResourceId,
+                CharSequence[] objects, Drawable[] imageDrawables, int selectedIndex) {
+            super(context, textViewResourceId, objects);
+            mSelectedIndex = selectedIndex;
+            mImageDrawables = imageDrawables;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater();
+            View view = inflater.inflate(R.layout.app_preference_item, parent, false);
+            CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.app_label);
+            checkedTextView.setText(getItem(position));
+            if (position == mSelectedIndex) {
+                checkedTextView.setChecked(true);
+            }
+            ImageView imageView = (ImageView)view.findViewById(R.id.app_image);
+            imageView.setImageDrawable(mImageDrawables[position]);
+            return view;
+        }
+    }
+
+    public AppListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setPackageNames(String[] packageNames, String defaultPackageName) {
+        // Look up all package names in PackageManager. Skip ones we can't find.
+        int foundPackages = 0;
+        PackageManager pm = getContext().getPackageManager();
+        ApplicationInfo[] appInfos = new ApplicationInfo[packageNames.length];
+        for (int i = 0; i < packageNames.length; i++) {
+            try {
+                appInfos[i] = pm.getApplicationInfo(packageNames[i], 0);
+                foundPackages++;
+            } catch (NameNotFoundException e) {
+                // Leave appInfos[i] uninitialized; it will be skipped in the list.
+            }
+        }
+
+        // Show the label and icon for each application package.
+        CharSequence[] applicationNames = new CharSequence[foundPackages];
+        mEntryDrawables = new Drawable[foundPackages];
+        int index = 0;
+        int selectedIndex = -1;
+        for (ApplicationInfo appInfo : appInfos) {
+            if (appInfo != null) {
+                applicationNames[index] = appInfo.loadLabel(pm);
+                mEntryDrawables[index] = appInfo.loadIcon(pm);
+                if (appInfo.packageName.contentEquals(defaultPackageName)) {
+                    selectedIndex = index;
+                }
+                index++;
+            }
+        }
+        setEntries(applicationNames);
+        setEntryValues(packageNames);
+        if (selectedIndex != -1) {
+            setValueIndex(selectedIndex);
+        }
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        int selectedIndex = findIndexOfValue(getValue());
+        ListAdapter adapter = new AppArrayAdapter(getContext(),
+            R.layout.app_preference_item, getEntries(), mEntryDrawables, selectedIndex);
+        builder.setAdapter(adapter, this);
+        super.onPrepareDialogBuilder(builder);
+    }
+}
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 76776cd..bbee5e9 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -118,6 +118,7 @@
     private static final String USE_NUPLAYER_KEY = "use_nuplayer";
     private static final String USE_NUPLAYER_PROPERTY = "persist.sys.media.use-nuplayer";
     private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
+    private static final String LOW_POWER_MODE_KEY = "low_power_mode";
     private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
     private static final String FORCE_MSAA_KEY = "force_msaa";
     private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
@@ -184,6 +185,7 @@
     private CheckBoxPreference mShowScreenUpdates;
     private CheckBoxPreference mDisableOverlays;
     private CheckBoxPreference mShowCpuUsage;
+    private CheckBoxPreference mLowPowerMode;
     private CheckBoxPreference mForceHardwareUi;
     private CheckBoxPreference mForceMsaa;
     private CheckBoxPreference mShowHwScreenUpdates;
@@ -293,6 +295,7 @@
         mShowScreenUpdates = findAndInitCheckboxPref(SHOW_SCREEN_UPDATES_KEY);
         mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY);
         mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);
+        mLowPowerMode = findAndInitCheckboxPref(LOW_POWER_MODE_KEY);
         mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
         mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY);
         mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
@@ -497,6 +500,7 @@
         updateShowTouchesOptions();
         updateFlingerOptions();
         updateCpuUsageOptions();
+        updateLowPowerModeOptions();
         updateHardwareUiOptions();
         updateMsaaOptions();
         updateTrackFrameTimeOptions();
@@ -1021,11 +1025,22 @@
                 mWifiDisplayCertification.isChecked() ? 1 : 0);
     }
 
+    private void updateLowPowerModeOptions() {
+        updateCheckBox(mLowPowerMode, Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.LOW_POWER_MODE, 0) != 0);
+    }
+
     private void updateCpuUsageOptions() {
         updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.SHOW_PROCESSES, 0) != 0);
     }
 
+    private void writeLowPowerModeOptions() {
+        boolean value = mLowPowerMode.isChecked();
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.LOW_POWER_MODE, value ? 1 : 0);
+    }
+
     private void writeCpuUsageOptions() {
         boolean value = mShowCpuUsage.isChecked();
         Settings.Global.putInt(getActivity().getContentResolver(),
@@ -1286,6 +1301,8 @@
             writeShowUpdatesOption();
         } else if (preference == mDisableOverlays) {
             writeDisableOverlaysOption();
+        } else if (preference == mLowPowerMode) {
+            writeLowPowerModeOptions();
         } else if (preference == mShowCpuUsage) {
             writeCpuUsageOptions();
         } else if (preference == mImmediatelyDestroyActivities) {
diff --git a/src/com/android/settings/SmsListPreference.java b/src/com/android/settings/SmsListPreference.java
deleted file mode 100644
index 15df776..0000000
--- a/src/com/android/settings/SmsListPreference.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.preference.ListPreference;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.CheckedTextView;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-
-/**
- * Extends ListPreference to allow us to show the icons for the available SMS applications. We do
- * this because the names of SMS applications are very similar and the user may not be able to
- * determine what app they are selecting without an icon.
- */
-public class SmsListPreference extends ListPreference {
-    private Drawable[] mEntryDrawables;
-
-    public class SmsArrayAdapter extends ArrayAdapter<CharSequence> {
-        private Drawable[] mImageDrawables = null;
-        private int mSelectedIndex = 0;
-
-        public SmsArrayAdapter(Context context, int textViewResourceId,
-                CharSequence[] objects, Drawable[] imageDrawables, int selectedIndex) {
-            super(context, textViewResourceId, objects);
-            mSelectedIndex = selectedIndex;
-            mImageDrawables = imageDrawables;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater();
-            View view = inflater.inflate(R.layout.sms_preference_item, parent, false);
-            CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.sms_text);
-            checkedTextView.setText(getItem(position));
-            if (position == mSelectedIndex) {
-                checkedTextView.setChecked(true);
-            }
-            ImageView imageView = (ImageView)view.findViewById(R.id.sms_image);
-            imageView.setImageDrawable(mImageDrawables[position]);
-            return view;
-        }
-    }
-
-    public SmsListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public void setEntryDrawables(Drawable[] entries) {
-        mEntryDrawables = entries;
-    }
-
-    public Drawable[] getEntryDrawables() {
-        return mEntryDrawables;
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(Builder builder) {
-        int selectedIndex = findIndexOfValue(getValue());
-        ListAdapter adapter = new SmsArrayAdapter(getContext(),
-            R.layout.sms_preference_item, getEntries(), mEntryDrawables, selectedIndex);
-        builder.setAdapter(adapter, this);
-        super.onPrepareDialogBuilder(builder);
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index b36b03c..fd2e945 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -26,9 +26,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.nfc.NfcAdapter;
@@ -85,7 +83,7 @@
     private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
-    private SmsListPreference mSmsApplicationPreference;
+    private AppListPreference mSmsApplicationPreference;
 
     public WirelessSettings() {
         super(null);
@@ -174,23 +172,6 @@
         }
     }
 
-    private void updateSmsApplicationSetting() {
-        log("updateSmsApplicationSetting:");
-        ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true);
-        if (appName != null) {
-            String packageName = appName.getPackageName();
-
-            CharSequence[] values = mSmsApplicationPreference.getEntryValues();
-            for (int i = 0; i < values.length; i++) {
-                if (packageName.contentEquals(values[i])) {
-                    mSmsApplicationPreference.setValueIndex(i);
-                    mSmsApplicationPreference.setSummary(mSmsApplicationPreference.getEntries()[i]);
-                    break;
-                }
-            }
-        }
-    }
-
     private void initSmsApplicationSetting() {
         log("initSmsApplicationSetting:");
         Collection<SmsApplicationData> smsApplications =
@@ -198,25 +179,18 @@
 
         // If the list is empty the dialog will be empty, but we will not crash.
         int count = smsApplications.size();
-        CharSequence[] entries = new CharSequence[count];
-        CharSequence[] entryValues = new CharSequence[count];
-        Drawable[] entryImages = new Drawable[count];
-
+        String[] packageNames = new String[count];
         int i = 0;
         for (SmsApplicationData smsApplicationData : smsApplications) {
-            entries[i] = smsApplicationData.mApplicationName;
-            entryValues[i] = smsApplicationData.mPackageName;
-            try {
-                entryImages[i] = mPm.getApplicationIcon(smsApplicationData.mPackageName);
-            } catch (NameNotFoundException e) {
-                entryImages[i] = mPm.getDefaultActivityIcon();
-            }
+            packageNames[i] = smsApplicationData.mPackageName;
             i++;
         }
-        mSmsApplicationPreference.setEntries(entries);
-        mSmsApplicationPreference.setEntryValues(entryValues);
-        mSmsApplicationPreference.setEntryDrawables(entryImages);
-        updateSmsApplicationSetting();
+        String defaultPackageName = null;
+        ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true);
+        if (appName != null) {
+            defaultPackageName = appName.getPackageName();
+        }
+        mSmsApplicationPreference.setPackageNames(packageNames, defaultPackageName);
     }
 
     @Override
@@ -284,7 +258,7 @@
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
-        mSmsApplicationPreference = (SmsListPreference) findPreference(KEY_SMS_APPLICATION);
+        mSmsApplicationPreference = (AppListPreference) findPreference(KEY_SMS_APPLICATION);
         mSmsApplicationPreference.setOnPreferenceChangeListener(this);
         initSmsApplicationSetting();
 
@@ -468,7 +442,6 @@
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mSmsApplicationPreference && newValue != null) {
             SmsApplication.setDefaultApplication(newValue.toString(), getActivity());
-            updateSmsApplicationSetting();
             return true;
         }
         return false;
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index b1145a1..ef27e2e 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -366,11 +366,28 @@
                 mUninstallButton.setText(R.string.uninstall_text);
             }
         }
-        // If this is a device admin, it can't be uninstall or disabled.
+        // If this is a device admin, it can't be uninstalled or disabled.
         // We do this here so the text of the button is still set correctly.
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             enabled = false;
         }
+
+        // If this is the default (or only) home app, suppress uninstall (even if
+        // we still think it should be allowed for other reasons)
+        if (enabled && mHomePackages.contains(mPackageInfo.packageName)) {
+            ArrayList<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+            ComponentName currentDefaultHome  = mPm.getHomeActivities(homeActivities);
+            if (currentDefaultHome == null) {
+                // No preferred default, so permit uninstall only when
+                // there is more than one candidate
+                enabled = (mHomePackages.size() > 1);
+            } else {
+                // There is an explicit default home app -- forbid uninstall of
+                // that one, but permit it for installed-but-inactive ones.
+                enabled = !mPackageInfo.packageName.equals(currentDefaultHome.getPackageName());
+            }
+        }
+
         mUninstallButton.setEnabled(enabled);
         if (enabled) {
             // Register listener
diff --git a/src/com/android/settings/notification/DropDownPreference.java b/src/com/android/settings/notification/DropDownPreference.java
new file mode 100644
index 0000000..15452a1
--- /dev/null
+++ b/src/com/android/settings/notification/DropDownPreference.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+public class DropDownPreference extends Preference {
+    private final Context mContext;
+    private final ArrayAdapter<String> mAdapter;
+    private final Spinner mSpinner;
+
+    private Callback mCallback;
+
+    public DropDownPreference(Context context) {
+        this(context, null);
+    }
+
+    public DropDownPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+        mAdapter = new ArrayAdapter<String>(mContext,
+                android.R.layout.simple_spinner_dropdown_item);
+
+        mSpinner = new Spinner(mContext);
+
+        mSpinner.setVisibility(View.INVISIBLE);
+        mSpinner.setAdapter(mAdapter);
+        mSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
+                setSelectedItem(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                // noop
+            }
+        });
+        setPersistent(false);
+        setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                mSpinner.performClick();
+                return true;
+            }
+        });
+    }
+
+    public void setDropDownWidth(int dimenResId) {
+        mSpinner.setDropDownWidth(mContext.getResources().getDimensionPixelSize(dimenResId));
+    }
+
+    public void setCallback(Callback callback) {
+        mCallback = callback;
+    }
+
+    public void setSelectedItem(int position) {
+        if (mCallback != null && !mCallback.onItemSelected(position)) {
+            return;
+        }
+        mSpinner.setSelection(position);
+        setSummary(mAdapter.getItem(position));
+        final boolean disableDependents = position == 0;
+        notifyDependencyChange(disableDependents);
+    }
+
+    public void addItem(int resId) {
+        mAdapter.add(mContext.getResources().getString(resId));
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        if (view.equals(mSpinner.getParent())) return;
+        if (mSpinner.getParent() != null) {
+            ((ViewGroup)mSpinner.getParent()).removeView(mSpinner);
+        }
+        final ViewGroup vg = (ViewGroup)view;
+        vg.addView(mSpinner, 0);
+        final ViewGroup.LayoutParams lp = mSpinner.getLayoutParams();
+        lp.width = 0;
+        mSpinner.setLayoutParams(lp);
+    }
+
+    public interface Callback {
+        boolean onItemSelected(int pos);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index 24863cd..2d613e4 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -57,7 +57,7 @@
 
     private Preference mNotificationSoundPreference;
     private Preference mNotificationAccess;
-    private TwoStatePreference mLockscreenNotifications;
+    private DropDownPreference mLockscreenNotifications;
     private TwoStatePreference mHeadsUp;
     private TwoStatePreference mNotificationPulse;
 
@@ -113,12 +113,24 @@
         refreshNotificationListeners();
 
         mLockscreenNotifications
-                = (TwoStatePreference) root.findPreference(KEY_LOCK_SCREEN_NOTIFICATIONS);
+                = (DropDownPreference) root.findPreference(KEY_LOCK_SCREEN_NOTIFICATIONS);
         if (mLockscreenNotifications != null) {
             if (!getDeviceLockscreenNotificationsEnabled()) {
                 root.removePreference(mLockscreenNotifications);
             } else {
-                mLockscreenNotifications.setChecked(getLockscreenAllowPrivateNotifications());
+                mLockscreenNotifications.addItem(R.string.lock_screen_notifications_summary_show);
+                mLockscreenNotifications.addItem(R.string.lock_screen_notifications_summary_hide);
+                final int pos = getLockscreenAllowPrivateNotifications() ? 0 : 1;
+                mLockscreenNotifications.setSelectedItem(pos);
+                mLockscreenNotifications.setCallback(new DropDownPreference.Callback() {
+                    @Override
+                    public boolean onItemSelected(int pos) {
+                        final int val = pos == 0 ? 1 : 0;
+                        Settings.Secure.putInt(getContentResolver(),
+                                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, val);
+                        return true;
+                    }
+                });
             }
         }
 
@@ -164,11 +176,7 @@
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         final String key = preference.getKey();
 
-        if (KEY_LOCK_SCREEN_NOTIFICATIONS.equals(key)) {
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
-                    mLockscreenNotifications.isChecked() ? 1 : 0);
-        } else if (KEY_HEADS_UP.equals(key)) {
+        if (KEY_HEADS_UP.equals(key)) {
             setHeadsUpMode(getContentResolver(), mHeadsUp.isChecked());
         } else if (KEY_NOTIFICATION_PULSE.equals(key)) {
             Settings.System.putInt(getContentResolver(),
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index de020db..050d2e9 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -18,21 +18,30 @@
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.app.INotificationManager;
+import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings.Global;
-import android.provider.SearchIndexableResource;
+import android.service.notification.ZenModeConfig;
+import android.text.format.DateFormat;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -40,41 +49,201 @@
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.Switch;
 import android.widget.TextView;
-import com.android.settings.search.BaseSearchIndexProvider;
+import android.widget.TimePicker;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Objects;
 
 public class ZenModeSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String TAG = "ZenModeSettings";
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = true;
+
+    private static final String KEY_GENERAL = "general";
+    private static final String KEY_CALLS = "phone_calls";
+    private static final String KEY_MESSAGES = "messages";
+
+    private static final String KEY_AUTOMATIC = "automatic";
+    private static final String KEY_WHEN = "when";
 
     private final Handler mHandler = new Handler();
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
 
-    private ZenModeConfigView mConfig;
     private Switch mSwitch;
     private Activity mActivity;
+    private Context mContext;
     private MenuItem mSearch;
+    private ZenModeConfig mConfig;
+    private boolean mDisableListeners;
+    private SwitchPreference mCalls;
+    private SwitchPreference mMessages;
+    private DropDownPreference mStarred;
+    private DropDownPreference mWhen;
+    private TimePickerPreference mStart;
+    private TimePickerPreference mEnd;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        mActivity = getActivity();
+        mContext = mActivity = getActivity();
         mSwitch = new Switch(mActivity.getActionBar().getThemedContext());
-        final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+        final Resources res = mContext.getResources();
+        final int p = res.getDimensionPixelSize(R.dimen.content_margin_left);
         mSwitch.setPadding(0, 0, p, 0);
         setHasOptionsMenu(true);
+
+        addPreferencesFromResource(R.xml.zen_mode_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+
+        mConfig = getZenModeConfig();
+        if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
+
+        final PreferenceCategory general = (PreferenceCategory) root.findPreference(KEY_GENERAL);
+
+        mCalls = (SwitchPreference) root.findPreference(KEY_CALLS);
+        mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                if (val == mConfig.allowCalls) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowCalls = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        mMessages = (SwitchPreference) root.findPreference(KEY_MESSAGES);
+        mMessages.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                if (val == mConfig.allowMessages) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange allowMessages=" + val);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.allowMessages = val;
+                return setZenModeConfig(newConfig);
+            }
+        });
+
+        mStarred = new DropDownPreference(mContext);
+        mStarred.setEnabled(false);
+        mStarred.setTitle(R.string.zen_mode_from);
+        mStarred.setDropDownWidth(R.dimen.zen_mode_dropdown_width);
+        mStarred.addItem(R.string.zen_mode_from_anyone);
+        mStarred.addItem(R.string.zen_mode_from_starred);
+        mStarred.addItem(R.string.zen_mode_from_contacts);
+        general.addPreference(mStarred);
+
+        final Preference alarmInfo = new Preference(mContext) {
+            @Override
+            public View getView(View convertView, ViewGroup parent) {
+                final TextView tv = new TextView(mContext);
+                tv.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.ITALIC));
+                tv.setPadding(p, p, p, p);
+                tv.setText(R.string.zen_mode_alarm_info);
+                return tv;
+            }
+        };
+        alarmInfo.setPersistent(false);
+        alarmInfo.setSelectable(false);
+        general.addPreference(alarmInfo);
+
+        final PreferenceCategory auto = (PreferenceCategory) root.findPreference(KEY_AUTOMATIC);
+
+        mWhen = new DropDownPreference(mContext);
+        mWhen.setKey(KEY_WHEN);
+        mWhen.setTitle(R.string.zen_mode_when);
+        mWhen.setDropDownWidth(R.dimen.zen_mode_dropdown_width);
+        mWhen.addItem(R.string.zen_mode_when_never);
+        mWhen.addItem(R.string.zen_mode_when_every_night);
+        mWhen.addItem(R.string.zen_mode_when_weeknights);
+        mWhen.setCallback(new DropDownPreference.Callback() {
+            @Override
+            public boolean onItemSelected(int pos) {
+                if (mDisableListeners) return true;
+                final String mode = pos == 1 ? ZenModeConfig.SLEEP_MODE_NIGHTS :
+                    pos == 2 ? ZenModeConfig.SLEEP_MODE_WEEKNIGHTS : null;
+                if (Objects.equals(mode, mConfig.sleepMode)) return true;
+                if (DEBUG) Log.d(TAG, "onPrefChange sleepMode=" + mode);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.sleepMode = mode;
+                return setZenModeConfig(newConfig);
+            }
+        });
+        auto.addPreference(mWhen);
+
+        final FragmentManager mgr = getFragmentManager();
+
+        mStart = new TimePickerPreference(mContext, mgr);
+        mStart.setTitle(R.string.zen_mode_start_time);
+        mStart.setCallback(new TimePickerPreference.Callback() {
+            @Override
+            public boolean onSetTime(int hour, int minute) {
+                if (mDisableListeners) return true;
+                if (!ZenModeConfig.isValidHour(hour)) return false;
+                if (!ZenModeConfig.isValidMinute(minute)) return false;
+                if (hour == mConfig.sleepStartHour && minute == mConfig.sleepStartMinute) {
+                    return true;
+                }
+                if (DEBUG) Log.d(TAG, "onPrefChange sleepStart h=" + hour + " m=" + minute);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.sleepStartHour = hour;
+                newConfig.sleepStartMinute = minute;
+                return setZenModeConfig(newConfig);
+            }
+        });
+        auto.addPreference(mStart);
+
+        mEnd = new TimePickerPreference(mContext, mgr);
+        mEnd.setTitle(R.string.zen_mode_end_time);
+        mEnd.setSummaryFormat(R.string.zen_mode_end_time_summary_format);
+        mEnd.setCallback(new TimePickerPreference.Callback() {
+            @Override
+            public boolean onSetTime(int hour, int minute) {
+                if (mDisableListeners) return true;
+                if (!ZenModeConfig.isValidHour(hour)) return false;
+                if (!ZenModeConfig.isValidMinute(minute)) return false;
+                if (hour == mConfig.sleepEndHour && minute == mConfig.sleepEndMinute) {
+                    return true;
+                }
+                if (DEBUG) Log.d(TAG, "onPrefChange sleepEnd h=" + hour + " m=" + minute);
+                final ZenModeConfig newConfig = mConfig.copy();
+                newConfig.sleepEndHour = hour;
+                newConfig.sleepEndMinute = minute;
+                return setZenModeConfig(newConfig);
+            }
+        });
+        auto.addPreference(mEnd);
+
+        mStart.setDependency(mWhen.getKey());
+        mEnd.setDependency(mWhen.getKey());
+
+        updateControls();
+    }
+
+    private void updateControls() {
+        mDisableListeners = true;
+        mCalls.setChecked(mConfig.allowCalls);
+        mMessages.setChecked(mConfig.allowMessages);
+        mStarred.setSelectedItem(0);
+        mWhen.setSelectedItem(
+                ZenModeConfig.SLEEP_MODE_NIGHTS.equals(mConfig.sleepMode) ? 1 :
+                ZenModeConfig.SLEEP_MODE_WEEKNIGHTS.equals(mConfig.sleepMode) ? 2 : 0);
+        mStart.setTime(mConfig.sleepStartHour, mConfig.sleepStartMinute);
+        mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute);
+        mDisableListeners = false;
     }
 
     @Override
@@ -87,7 +256,7 @@
     @Override
     public void onResume() {
         super.onResume();
-        updateState();
+        updateZenMode();
         mSettingsObserver.register();
         mActivity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
                 ActionBar.DISPLAY_SHOW_CUSTOM);
@@ -106,31 +275,7 @@
         if (mSearch != null) mSearch.setVisible(true);
     }
 
-    private final class SettingsObserver extends ContentObserver {
-        private final Uri ZEN_MODE_URI = Global.getUriFor(Global.ZEN_MODE);
-
-        public SettingsObserver() {
-            super(mHandler);
-        }
-
-        public void register() {
-            getContentResolver().registerContentObserver(ZEN_MODE_URI, false, this);
-        }
-
-        public void unregister() {
-            getContentResolver().unregisterContentObserver(this);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            super.onChange(selfChange, uri);
-            if (ZEN_MODE_URI.equals(uri)) {
-                updateState();
-            }
-        }
-    };
-
-    private void updateState() {
+    private void updateZenMode() {
         mSwitch.setOnCheckedChangeListener(null);
         final boolean zenMode = Global.getInt(getContentResolver(),
                 Global.ZEN_MODE, Global.ZEN_MODE_OFF) != Global.ZEN_MODE_OFF;
@@ -138,22 +283,38 @@
         mSwitch.setOnCheckedChangeListener(mSwitchListener);
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final Context context = getActivity();
-        final ScrollView sv = new ScrollView(context);
-        sv.setVerticalScrollBarEnabled(false);
-        sv.setHorizontalScrollBarEnabled(false);
-        mConfig = new ZenModeConfigView(context);
-        sv.addView(mConfig);
-        return sv;
+    private void updateZenModeConfig() {
+        final ZenModeConfig config = getZenModeConfig();
+        if (Objects.equals(config, mConfig)) return;
+        if (DEBUG) Log.d(TAG, "updateZenModeConfig");
+        updateControls();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mConfig.resetBackground();
+    private ZenModeConfig getZenModeConfig() {
+        final INotificationManager nm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        try {
+            return nm.getZenModeConfig();
+        } catch (Exception e) {
+           Log.w(TAG, "Error calling NoMan", e);
+           return new ZenModeConfig();
+        }
+    }
+
+    private boolean setZenModeConfig(ZenModeConfig config) {
+        final INotificationManager nm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        try {
+            final boolean success = nm.setZenModeConfig(config);
+            if (success) {
+                mConfig = config;
+                if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig);
+            }
+            return success;
+        } catch (Exception e) {
+           Log.w(TAG, "Error calling NoMan", e);
+           return false;
+        }
     }
 
     private final OnCheckedChangeListener mSwitchListener = new OnCheckedChangeListener() {
@@ -169,191 +330,134 @@
         }
     };
 
-    public static final class ZenModeConfigView extends LinearLayout {
-        private static final Typeface LIGHT =
-                Typeface.create("sans-serif-light", Typeface.NORMAL);
-        private static final int BG_COLOR = 0xffe7e8e9;
-        private final Context mContext;
-
-        private Drawable mOldBackground;
-
-        public ZenModeConfigView(Context context) {
-            super(context);
-            mContext = context;
-            setOrientation(VERTICAL);
-
-            int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
-            TextView tv = addHeader("When on");
-            tv.setPadding(0, p / 2, 0, p / 4);
-            addBuckets();
-            tv = addHeader("Automatically turn on");
-            tv.setPadding(0, p / 2, 0, p / 4);
-            addTriggers();
-        }
-
-        @Override
-        protected void onAttachedToWindow() {
-            super.onAttachedToWindow();
-            mOldBackground = getParentView().getBackground();
-            if (DEBUG) Log.d(TAG, "onAttachedToWindow mOldBackground=" + mOldBackground);
-            getParentView().setBackgroundColor(BG_COLOR);
-        }
-
-        public void resetBackground() {
-            if (DEBUG) Log.d(TAG, "resetBackground");
-            getParentView().setBackground(mOldBackground);
-        }
-
-        private View getParentView() {
-            return (View)getParent().getParent();
-        }
-
-        private TextView addHeader(String text) {
-            TextView tv = new TextView(mContext);
-            tv.setTypeface(LIGHT);
-            tv.setTextColor(0x7f000000);
-            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
-            tv.setText(text);
-            addView(tv);
-            return tv;
-        }
-
-        private void addTriggers() {
-            addView(new TriggerView("Never"));
-        }
-
-        private void addBuckets() {
-            LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT,
-                    LayoutParams.WRAP_CONTENT);
-            BucketView callView = new BucketView("Phone calls", 0,
-                    "Block all", "Block all except...", "Allow all");
-            addView(callView, lp);
-            lp.topMargin = 4;
-            BucketView msgView = new BucketView("Texts, SMS, & other calls", 0,
-                    "Block all", "Block all except...", "Allow all");
-            addView(msgView, lp);
-            BucketView alarmView = new BucketView("Alarms & timers", 2,
-                    "Block all", "Block all except...", "Allow all");
-            addView(alarmView, lp);
-            BucketView otherView = new BucketView("Other interruptions", 0,
-                    "Block all", "Block all except...", "Allow all");
-            addView(otherView, lp);
-        }
-
-        private class BucketView extends RelativeLayout {
-            public BucketView(String category, int defaultValue, String... values) {
-                super(ZenModeConfigView.this.mContext);
-
-                setBackgroundColor(0xffffffff);
-                final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
-                final int lm = p * 3 / 4;
-                TextView title = new TextView(mContext);
-                title.setId(android.R.id.title);
-                title.setTextColor(0xff000000);
-                title.setTypeface(LIGHT);
-                title.setText(category);
-                title.setTextSize(TypedValue.COMPLEX_UNIT_PX, title.getTextSize() * 1.5f);
-                LayoutParams lp =
-                        new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-                lp.topMargin = p / 2;
-                lp.leftMargin = lm;
-                addView(title, lp);
-
-                TextView subtitle = new TextView(mContext);
-                subtitle.setTextColor(0xff000000);
-                subtitle.setTypeface(LIGHT);
-                subtitle.setText(values[defaultValue]);
-                lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-                lp.addRule(BELOW, title.getId());
-                lp.leftMargin = lm;
-                lp.bottomMargin = p / 2;
-                addView(subtitle, lp);
-            }
-        }
-
-        private class TriggerView extends RelativeLayout {
-            public TriggerView(String text) {
-                super(ZenModeConfigView.this.mContext);
-
-                setBackgroundColor(0xffffffff);
-                final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
-
-                final TextView tv = new TextView(mContext);
-                tv.setText(text);
-                tv.setTypeface(LIGHT);
-                tv.setTextColor(0xff000000);
-                tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
-                LayoutParams lp =
-                        new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-                lp.addRule(CENTER_VERTICAL);
-                lp.bottomMargin = p / 2;
-                lp.topMargin = p / 2;
-                lp.leftMargin = p * 3 / 4;
-                addView(tv, lp);
-            }
-        }
-    }
-
     // Enable indexing of searchable data
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
             @Override
             public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
                 final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-                final Resources res = context.getResources();
-
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = res.getString(R.string.zen_mode_settings_title);
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "When on";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "Calls";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "Text & SMS Messages";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "Alarms & Timers";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "Other Interruptions";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "Automatically turn on";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "While driving";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "While in meetings";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = "During a set time period";
-                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                result.add(data);
-
+                add(result, context, R.string.zen_mode_settings_title);
+                add(result, context, R.string.zen_mode_general_category);
+                add(result, context, R.string.zen_mode_phone_calls);
+                add(result, context, R.string.zen_mode_messages);
+                add(result, context, R.string.zen_mode_automatic_category);
+                add(result, context, R.string.zen_mode_when);
+                add(result, context, R.string.zen_mode_start_time);
+                add(result, context, R.string.zen_mode_end_time);
                 return result;
             }
+
+            private void add(List<SearchIndexableRaw> result, Context context, int title) {
+                final Resources res = context.getResources();
+                final SearchIndexableRaw data = new SearchIndexableRaw(context);
+                data.title = res.getString(title);
+                data.screenTitle = res.getString(R.string.zen_mode_settings_title);
+                result.add(data);
+            }
         };
 
+    private final class SettingsObserver extends ContentObserver {
+        private final Uri ZEN_MODE_URI = Global.getUriFor(Global.ZEN_MODE);
+        private final Uri ZEN_MODE_CONFIG_ETAG_URI = Global.getUriFor(Global.ZEN_MODE_CONFIG_ETAG);
+
+        public SettingsObserver() {
+            super(mHandler);
+        }
+
+        public void register() {
+            getContentResolver().registerContentObserver(ZEN_MODE_URI, false, this);
+            getContentResolver().registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this);
+        }
+
+        public void unregister() {
+            getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (ZEN_MODE_URI.equals(uri)) {
+                updateZenMode();
+            }
+            if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
+                updateZenModeConfig();
+            }
+        }
+    }
+
+    private static class TimePickerPreference extends Preference {
+        private final Context mContext;
+
+        private int mSummaryFormat;
+        private int mHourOfDay;
+        private int mMinute;
+        private Callback mCallback;
+
+        public TimePickerPreference(Context context, final FragmentManager mgr) {
+            super(context);
+            mContext = context;
+            setPersistent(false);
+            setOnPreferenceClickListener(new OnPreferenceClickListener(){
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final TimePickerFragment frag = new TimePickerFragment();
+                    frag.pref = TimePickerPreference.this;
+                    frag.show(mgr, TimePickerPreference.class.getName());
+                    return true;
+                }
+            });
+        }
+
+        public void setCallback(Callback callback) {
+            mCallback = callback;
+        }
+
+        public void setSummaryFormat(int resId) {
+            mSummaryFormat = resId;
+            updateSummary();
+        }
+
+        public void setTime(int hourOfDay, int minute) {
+            if (mCallback != null && !mCallback.onSetTime(hourOfDay, minute)) return;
+            mHourOfDay = hourOfDay;
+            mMinute = minute;
+            updateSummary();
+        }
+
+        private void updateSummary() {
+            final Calendar c = Calendar.getInstance();
+            c.set(Calendar.HOUR_OF_DAY, mHourOfDay);
+            c.set(Calendar.MINUTE, mMinute);
+            String time = DateFormat.getTimeFormat(mContext).format(c.getTime());
+            if (mSummaryFormat != 0) {
+                time = mContext.getResources().getString(mSummaryFormat, time);
+            }
+            setSummary(time);
+        }
+
+        public static class TimePickerFragment extends DialogFragment implements
+                TimePickerDialog.OnTimeSetListener {
+            public TimePickerPreference pref;
+
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;
+                final Calendar c = Calendar.getInstance();
+                final int hour = usePref ? pref.mHourOfDay : c.get(Calendar.HOUR_OF_DAY);
+                final int minute = usePref ? pref.mMinute : c.get(Calendar.MINUTE);
+                return new TimePickerDialog(getActivity(), this, hour, minute,
+                        DateFormat.is24HourFormat(getActivity()));
+            }
+
+            public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+                if (pref != null) {
+                    pref.setTime(hourOfDay, minute);
+                }
+            }
+        }
+
+        public interface Callback {
+            boolean onSetTime(int hour, int minute);
+        }
+    }
 }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index d8213ff..0a66046 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -639,11 +639,23 @@
                 pref.setTitle(user.name);
             }
             if (!isInitialized(user)) {
-                pref.setSummary(user.isRestricted()
-                        ? R.string.user_summary_restricted_not_set_up
-                        : R.string.user_summary_not_set_up);
+                if (user.isRestricted()) {
+                    pref.setSummary(R.string.user_summary_restricted_not_set_up);
+                } else if (user.isManagedProfile()) {
+                    pref.setSummary(R.string.user_summary_managed_profile_not_set_up);
+                } else {
+                    pref.setSummary(R.string.user_summary_not_set_up);
+                }
             } else if (user.isRestricted()) {
                 pref.setSummary(R.string.user_summary_restricted_profile);
+            } else if (user.isManagedProfile()) {
+                DevicePolicyManager dpm = (DevicePolicyManager)
+                        getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
+                if (dpm.isProfileEnabled(user.id)) {
+                    pref.setSummary(R.string.user_summary_managed_profile);
+                } else {
+                    pref.setSummary(R.string.user_summary_managed_profile_not_enabled);
+                }
             }
             if (user.iconPath != null) {
                 if (mUserIcons.get(user.id) == null) {