diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml
index c911f03..9d18abc5 100644
--- a/res/layout/condition_card.xml
+++ b/res/layout/condition_card.xml
@@ -103,18 +103,22 @@
 
                 <Button
                     android:id="@+id/first_action"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:paddingStart="0dp"
                     android:alpha=".8"
+                    android:textAlignment="viewStart"
                     android:textColor="?android:attr/textColorPrimaryInverse"
                     style="?android:attr/buttonBarButtonStyle" />
 
                 <Button
                     android:id="@+id/second_action"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:alpha=".8"
+                    android:textAlignment="viewStart"
                     android:textColor="?android:attr/textColorPrimaryInverse"
                     style="?android:attr/buttonBarButtonStyle" />
 
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index 2c0e7de..2348b6a 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -29,6 +29,7 @@
         android:orientation="vertical">
 
         <com.android.setupwizardlib.view.RichTextView
+            android:id="@+id/description_text"
             style="@style/SuwDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/support_offline_escalation_options.xml b/res/layout/support_offline_escalation_options.xml
index 4f6940c..6a54fba 100644
--- a/res/layout/support_offline_escalation_options.xml
+++ b/res/layout/support_offline_escalation_options.xml
@@ -64,5 +64,6 @@
         style="@style/SupportSecondaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="48dp"/>
+        android:minHeight="48dp"
+        android:visibility="gone"/>
 </LinearLayout>
diff --git a/res/raw/gesture_ambient_move_lift.mp4 b/res/raw/gesture_ambient_move_lift.mp4
deleted file mode 100644
index e69de29..0000000
--- a/res/raw/gesture_ambient_move_lift.mp4
+++ /dev/null
diff --git a/res/raw/gesture_ambient_tap.mp4 b/res/raw/gesture_ambient_tap.mp4
deleted file mode 100644
index e69de29..0000000
--- a/res/raw/gesture_ambient_tap.mp4
+++ /dev/null
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a54b857..a4c3424 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Goed"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Vee uit"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Kom ons begin"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Kom ons begin!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaas jou vinger op die sensor en lig dit op wanneer jy \'n vibrasie voel"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Hou aan daarmee"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg jou vinger effens om al die verskillende dele van jou vingerafdruk by te voeg"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskerm jou tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskerm jou toestel"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskerm jou foon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Stel \'n rugsteunskermslot op vir bykomende sekuriteit."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon, PIN of wagwoord wees. Stel \'n rugsteunskermslot op vir bykomende sekuriteit."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Keer ander mense om hierdie tablet sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliseer helderheidsvlak vir die beskikbare lig"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Aandbeligting"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Aandbeligting tint jou skerm rooi. Dit maak dit makliker om in dowwe lig te lees of na jou skerm te kyk en sal jou dalk help om makliker aan die slaap te raak."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Skedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Aandbeligting tint jou skerm snags rooi. Dit maak dit makliker om in dowwe lig na jou skerm te kyk of te lees en sal jou dalk help om makliker weer aan die slaap te raak."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Skakel outomaties aan"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nooit"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Gepasmaakte skedule"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6f4ff23..abb0a78 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ስም"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"እሺ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ሰርዝ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"እንጀምር"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"እንጀምር!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ጣትዎን በዳሳሹ ላይ ያስቀምጡትና ንዝረት ከተሰማዎት በኋላ ያንሱት"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ይቀጥሉ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ሁሉንም የተለያዩ የጣት አሻራዎን ክፍሎች ከማከል ጣትዎን በትንሹ ያንቀሳቅሱት"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ለጡባዊዎ ጥበቃ ያድርጉ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ለመሣሪያዎ ጥበቃ ያድርጉ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ለእርስዎ ስልክ ጥበቃ ይድርጉ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ለተጨማሪ ደህንነት የምትኬ ማያ ገጽ መቆለፊያን ያዘጋጁ።"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"የእርስዎ ጣት አሻራ ደኅንነት አስተማማኝነት ከጠንካራ ሥርዓተ ጥለት፣ ፒን ወይም የይለፍ ቃል ያነሰ ሊኖረው ይችላል። ለተጨማሪ ደኅንነት ምትኬ የማያ ገጽ መቆለፊያን ያዘጋጁ።"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ጡባዊ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"የመሣሪያ ጥበቃ ማድረጊያ ባሕሪዎችን በማግበር ያለ እርስዎ ፈቃድ ሌሎች ይህን መሣሪያ እንዳይጠቀሙ ይከላከሉዋቸው። መጠቀም የሚፈልጉትን ማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ስልክ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ተለማማጅ ብሩህነት"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ለሚገኘው ብርሃን የብሩህነት ደረጃ አመቻች"</string>
     <string name="night_display_title" msgid="2626451512200357686">"የምሽት ብርሃን"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"የምሽት ብርሃን ለማያ ገጽዎ ቀይ ቅልም ይሰጠዋል። ይሄ ማያ ገጽዎን በደበዘዘ ብርሃን ላይ መመልከት ቀላል ያድርግልዎታል፣ እና በበለጠ ቅለት እንዲተኙ ሊያገዘዎት ይችላል።"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"የጊዜ ሰሌዳ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ሁኔታ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"የምሽት ብርሃን ማታ ላይ ለማያ ገጽዎ ቀይ ቅልም ይሰጠዋል። ይሄ ማያ ገጽዎን በደበዘዘ ብርሃን ላይ መመልከት ቀላል ያድርግልዎታል፣ እና በበለጠ ቅለት እንዲተኙ ሊያገዘዎት ይችላል።"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"በራስ-ሰር አብራ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"በጭራሽ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ብጁ መርሐግብር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1d1a0ff..3829c53 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -367,7 +367,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"الاسم"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"حسنًا"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"البدء"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"البدء"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ضع إصبعك على المستشعر وارفعه بعد الشعور بالاهتزاز"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"استمر في المحاولة"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"حرِّك إصبعك قليلاً لإضافة جميع الأجزاء المختلفة لبصمة إصبعك"</string>
@@ -437,7 +437,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"حماية جهازك اللوحي"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"حماية جهازك"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"حماية هاتفك"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"للحصول على مزيد من الأمان، يمكنك إعداد قفل شاشة احتياطي."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ربما تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي أو كلمة مرور قوية. للحصول على مزيد من الأمان، يمكنك إعداد قفل شاشة احتياطي."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"يمكنك منع الآخرين من استخدام هذا الجهاز اللوحي بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
@@ -942,9 +942,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع المتكيف"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"تحسين مستوى السطوع بحسب الإضاءة المتاحة"</string>
     <string name="night_display_title" msgid="2626451512200357686">"إضاءة ليلية"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الأحمر تلوينًا خفيفًا. ويساعد هذا في تسهيل النظر إلى الشاشة في الإضاءة المعتمة ويمكن أن يساعدك في الشعور بالنعاس بسهولة."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"الجدول الزمني"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"الحالة"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الأحمر عند المساء تلوينًا خفيفًا. ويساعد هذا في تسهيل النظر إلى الشاشة في الإضاءة المعتمة ويمكن أن يساعدك في الشعور بالنعاس بسهولة."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"التشغيل تلقائيًا"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"مطلقًا"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"جدول زمني مخصّص"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 3d32e63..fb56473 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ad"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Silin"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Başlayaq"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Başlayaq!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmağı sensora qoyun və vibrasiyə hiss edənə qədər saxlayın"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Davam edin"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmaq izinizi tam əlavə etmək üçün barmağınızı yavaşca hərəkət etdirin"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Planşetinizi qoruyun"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Cihazınızı qoruyun"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefonunuzu qoruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Əlavə edilmiş təhlükəsizlik üçün, arxa fon ekran kilidini quraşdırın."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Barmaq izi güclü nümunə kod və ya PIN koddan daha az təhlükəsizdir. Əlavə edilmiş təhlükəsizlik üçün, arxa fon ekran kilidini quraşdırın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptiv parlaqlıq"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Hazırkı işıq üçün parlaqlığı optimallaşdırın"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Gecə işığı"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Gecə İşığı qırmızı rəngdə olur. Bununla da ekrana və ya zəif işıqda qırmızıya baxmaq və yuxuya getmək daha asan olur."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Cədvəl"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Vəziyyət"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Gecə İşığı gecə vaxtı qırmızı rəngdə olur. Bununla da ekrana və ya zəif işıqda qırmızıya baxmaq və yuxuya getmək daha asan olur."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Avtomatik aktivləşdirin"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Heç vaxt"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Fərdi cədvəl"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index fbdefb8..1814c56 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -358,7 +358,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Potvrdi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Započnimo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Da počnemo!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kada osetite vibraciju"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite dalje"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Malo pomerite prst da biste dodali različite delove otiska prsta"</string>
@@ -428,7 +428,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite uređaj"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Radi veće bezbednosti podesite rezervni metod za zaključavanje ekrana."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak prsta može da bude manje bezbedan od jakog šablona, PIN-a ili lozinke. Podesite rezervni metod za zaključavanje ekrana radi dodatne bezbednosti."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Sprečite druge da koriste ovaj tablet bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Sprečite druge da koriste ovaj telefon bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
@@ -915,9 +915,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvetljenost"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizuje nivo osvetljenosti prema dostupnom svetlu"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svetlo"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Noćno svetlo daje ekranu crvenu nijansu. To vam omogućava da lakše pregledate sadržaj ekrana pri prigušenom svetlu i da lakše zaspite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Zakažite"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Noćno svetlo daje ekranu crvenu nijansu noću. To vam omogućava da lakše pregledate sadržaj ekrana pri prigušenom svetlu i da lakše zaspite."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatski uključi"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikad"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Prilagođeni raspored"</string>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index f8d5a73..676f4fb 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Імя"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Выдаліць"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Прыступім"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Прыступім!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Прыкладзіце палец да сэнсара і ўтрымлівайце яго, пакуль не адчуеце вібрацыю"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Працягвайце"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Злёгку паварушыце пальцам, каб дадаць усе часткі вашага пальца"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Абараніце свой планшэт"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Абараніце сваю прыладу"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Абараніце свой тэлефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Для большай бяспекі наладзьце запасны спосаб блакіроўкі экрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Выкарыстанне адбітка пальца можа быць менш надзейным, чым складаны ўзор, PIN-код або пароль. Для большай бяспекі наладзьце запасны спосаб блакіроўкі экрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Прадухіліце выкарыстанне гэтага планшэта без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Прадухіліце выкарыстанне гэтай прылады без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Прадухіліце выкарыстанне гэтага тэлефона без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптыўная рэгуліроўка яркасці"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Аптымізаваць узровень яркасці ў залежнасці ад асвятлення"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Начная падсветка"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Функцыя \"Начная падсветка\" дадае вашаму экрану чырвонае адценне. Глядзець на экран або чытаць пры слабым святле становіцца лягчэй, і гэта можа дапамагчы вам хутчэй засынаць."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Графік"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Стан"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Функцыя \"Начная падсветка\" дадае вашаму экрану чырвонае адценне ўначы. Глядзець на экран або чытаць пры слабым святле становіцца лягчэй, і гэта можа дапамагчы вам хутчэй засынаць."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Уключаць аўтаматычна"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ніколі"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Карыстальніцкі расклад"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e37ced5..2028022 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Име"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Изтриване"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Да започваме"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Да започваме!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Поставете пръста си върху сензора и го вдигнете, след като усетите вибриране"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Продължавайте"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Движете пръста си леко, за да добавите всички различни части от отпечатъка си"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Защита на таблета"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Защита на устройството"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Защитете телефона си"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"За допълнителна сигурност настройте резервна опция за заключване на екрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Отпечатъкът може да е по-малко сигурен в сравнение с надеждна фигура, ПИН код или парола. За допълнителна сигурност настройте резервна опция за заключване на екрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Предотвратете използването на този таблет от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Предотвратете използването на това устройство от други хора без разрешението ви, като активирате функциите за защитата му. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Предотвратете използването на този телефон от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивна яркост"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизиране на нивото на яркостта спрямо наличната светлина"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Нощно осветление"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Функцията за нощно осветление придава червен нюанс на екрана. Това подобрява видимостта му и четенето на него при слаба светлина и може да ви помогне да заспите по-лесно."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Насрочване"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Състояние"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Функцията за нощно осветление придава червен нюанс на екрана ви през нощта. Това подобрява видимостта му или четенето на него при слаба светлина и може да ви помогне да заспите по-лесно."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматично включване"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никога"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Персонализиран график"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 8c6eb65..042170b 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"নাম"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ঠিক আছে"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"মুছুন"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"এখন শুরু করা যাক"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"এখন শুরু করা যাক!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"সেন্সরে আপনার আঙ্গুল রাখুন এবং আপনি একটি কম্পন অনুভব করার পর সরিয়ে নিন"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"করতে থাকুন"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"আপনার আঙ্গুলের ছাপের সমস্ত অংশগুলি যোগ করতে আপনার আঙ্গুল সামান্য সরান"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"আপনার ট্যাবলেটটিকে নিরাপদ করুন"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"আপনার ডিভাইসটিকে নিরাপদ করুন"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"আপনার ফোন রক্ষা করুন"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"অতিরিক্ত নিরাপত্তার জন্য একটি ব্যাক আপ স্ক্রীন লক সেট আপ করুন৷"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"আপনার আঙ্গুলের ছাপ একটি শক্তিশালী প্যাটার্ন বা পিন এর চাইতে কম নিরাপদ হতে পারে। অতিরিক্ত নিরাপত্তা যোগ করার জন্য একটি ব্যাক আপ স্ক্রীন লক সেট আপ করুন৷"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ট্যাবলেটটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ডিভাইসটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ফোনটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক বেছে নিন৷"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"অভিযোজিত উজ্জ্বলতা"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"উপলব্ধ আলোর পরিপ্রেক্ষিতে উজ্জ্বলতার স্তর মানানসই করুন"</string>
     <string name="night_display_title" msgid="2626451512200357686">"নাইট লাইট"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"নাইট লাইট আপনার স্ক্রীনকে লাল আভা দেয়৷ এটি আপনাকে অস্পষ্ট আলোয় স্ক্রীনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব সহজে ঘুমিয়ে পড়তে সহায়তা করে৷"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"সময়সূচী"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"স্থিতি"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"নাইট লাইট রাতে আপনার স্ক্রীনকে লাল আভা দেয়৷ এটি আপনাকে অস্পষ্ট আলোয় স্ক্রীনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব সহজে ঘুমিয়ে পড়তে সহায়তা করে৷"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"স্বয়ংক্রিয়ভাবে চালু করুন"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"কখনই নয়"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"কাস্টম সময়সূচী"</string>
@@ -3142,8 +3140,8 @@
     <string name="support_escalation_by_chat" msgid="977019859110763749">"চ্যাট করুন"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় অনুসন্ধান করুন এবং মতামত পাঠান"</string>
-    <string name="support_sign_in_required_title" msgid="6782855985258687680">"সহায়তার জন্য প্রবেশ করুন"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"প্রবেশ করুন"</string>
+    <string name="support_sign_in_required_title" msgid="6782855985258687680">"সহায়তার জন্য প্রবেশ করুন করুন"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"প্রবেশ করুন করুন"</string>
     <string name="support_sign_in_required_help" msgid="3930256366697956788">"আপনার অ্যাকাউন্ট অ্যাক্সেস করতে পারছেন না?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"সিস্টেমের তথ্য পাঠান"</string>
     <string name="support_disclaimer_content" msgid="6702447747744624871">"আপনার সমস্যাকে দ্রুত চিহ্নিত করার কাজে সহায়তা করতে, নির্ণয়ের জন্য আমাদের সিস্টেমের তথ্য চাই৷"</string>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index c41fe64..d7835eb 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -229,7 +229,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB pohr. je akt. samo za čit."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD kartica je aktivirana samo za čitanje."</string>
     <string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
-    <string name="next_label" msgid="4693520878012668114">"Naprijed"</string>
+    <string name="next_label" msgid="4693520878012668114">"Dalje"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Jezici"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Izbor jezika"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Ukloni"</string>
@@ -358,7 +358,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Počnimo!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Počnimo!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kad osjetite vibraciju"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Blago pomjerajte prst kako biste dodali sve različite dijelove svog otiska prsta"</string>
@@ -376,7 +376,7 @@
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Vrijeme za uzimanje otiska prsta je isteklo. Pokušajte ponovo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Upis otiska prsta nije uspio. Pokušajte ponovo ili koristite drugi prst."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj još jedan"</string>
-    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Naprijed"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalje"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Osim otključavanja telefona, otisak prsta takođe možete koristiti za odobravanje kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"Opcija za zaključavanje ekrana nije omogućena. Obratite se administratoru organizacije da biste saznali više. "<annotation id="admin_details">"Više detalja"</annotation>\n\n"I dalje možete koristiti otisak prsta za autorizaciju kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Podignite prst, zatim ponovo dodirnite senzor"</string>
@@ -428,7 +428,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite svoj uređaj"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite svoj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost podesite rezervni način zaključavanja ekrana."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak vašeg prsta može biti manje siguran nego jak uzorak, PIN kôd ili lozinka. Za dodatnu sigurnost, postavite pomoćno zaključavanje ekrana."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
@@ -552,7 +552,7 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Uredu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Otkaži"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Otkaži"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Naprijed"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalje"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Postavljanje je završeno."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracija uređaja"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administratori uređaja"</string>
@@ -915,9 +915,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvijetljenost"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziraj nivo osvjetljenja za dostupno svjetlo"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svjetlo"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Noćno svjetlo oboji ekran u crveno. Tako je lakše gledati u ekran ili čitati pod prigušenim svjetlom, a može vam pomoći da lakše zaspite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Raspored"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Noćno svjetlo navečer oboji ekran u crveno. Tako je lakše gledati u ekran ili čitati pod prigušenim svjetlom, a može vam pomoći da lakše zaspite."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatski uključi"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikad"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Prilagođeni raspored"</string>
@@ -1330,7 +1328,7 @@
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Pružaoci satelitskih slika:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Ručno"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Došlo je do problema sa učitavanjem priručnika."</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence otvorenog koda"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence za otvorene izvore"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pojavio se problem s učitavanjem licenci."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Učitavanje…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sigurnosne informacije"</string>
@@ -2061,7 +2059,7 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj mrežu"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Osvježi spisak"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Preskoči"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"Naprijed"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Dalje"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Nazad"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalji o mreži"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Poveži se"</string>
@@ -2079,7 +2077,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP nije podržan."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Ne možete konfigurirati EAP Wi-Fi vezu za vrijeme podešavanja. Nakon podešavanja, možete to uraditi u Postavke i Bežični i mreža."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Povezivanje može potrajati nekoliko minuta…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Dodirnite "<b>"Naprijed"</b>" da nastavite s podešavanjem.\n\nDodirnite "<b>"Nazad"</b>" da se povežete s drugom Wi‑Fi mrežom."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Dodirnite "<b>"Dalje"</b>" da nastavite s podešavanjem.\n\nDodirnite "<b>"Nazad"</b>" da se povežete s drugom Wi‑Fi mrežom."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogućena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhroniziranje onemogućeno"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinhronizuje se"</string>
@@ -2458,7 +2456,7 @@
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Lokacija"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Omogućava da aplikacije koriste informacije o lokaciji"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Nazad"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"Naprijed"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Dalje"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Kraj"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Snimi sliku"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Izaberi sliku iz Galerije"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ded84ad..348595d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"D\'acord"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Suprimeix"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Comencem"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Comencem"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fes-ho un altre cop"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mou el dit lleugerament perquè es pugui captar l’empremta digital sencera"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protegeix la tauleta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protegeix el dispositiu"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protegeix el telèfon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Configura un bloqueig de pantalla alternatiu per a més seguretat."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fer servir l\'empremta digital pot ser menys segur que utilitzar un patró, un PIN o una contrasenya segurs. Configura un bloqueig de pantalla alternatiu per a més seguretat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillantor automàtica"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimitza el nivell de brillantor segons la llum disponible"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Llum nocturna"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"La llum nocturna acoloreix la pantalla de vermell. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planifica"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estat"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"La llum nocturna acoloreix la pantalla de vermell quan és de nit. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activa automàticament"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Mai"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programació personalitzada"</string>
@@ -1609,7 +1607,7 @@
     <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionari personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Afegeix"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Afegeix al diccionari"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Afegir al diccionari"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Frase"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Més opcions"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menys opcions"</string>
@@ -2360,7 +2358,7 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Vols suprimir el convidat?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Suprimeix"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"Activa les trucades"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Activa les trucades telefòniques"</string>
     <string name="user_enable_calling_sms" msgid="9172507088023097063">"Activa les trucades i els SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Suprimeix l\'usuari"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vols activar les trucades?"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c643fc9..b7aabfa 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jméno"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Smazat"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Začínáme"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Začínáme!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Umístěte prst na senzor. Až ucítíte vibraci, zvedněte jej."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Pokračujte"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lehce pohněte prstem, aby se zaznamenaly všechny části otisku"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Ochraňte svůj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Ochraňte své zařízení"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Chraňte svůj telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za účelem zvýšení zabezpečení nastavte záložní zámek obrazovky."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisk prstu není tak bezpečný jako silné gesto, kód PIN nebo heslo. Za účelem zvýšení zabezpečení nastavte záložní zámek obrazovky."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptivní jas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovat úroveň jasu podle okolního světla"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noční režim"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Noční režim obrazovku zbarví do červena. Čtení a sledování obrazovky při tlumeném osvětlení tak bude snazší a bude se vám lépe usínat."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Plán"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stav"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Noční režim obrazovku v noci zbarví do červena. Čtení a sledování obrazovky při tlumeném osvětlení tak bude snazší a bude se vám lépe usínat."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Zapnout automaticky"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikdy"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Vlastní plán"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 09cd369..feadf8a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slet"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Lad os komme i gang"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Lad os komme i gang!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placer fingeren på sensoren, og løft, når du mærker en vibration"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Bliv ved"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bevæg fingeren en smule for at få hele fingeraftrykket med"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskyt din tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskyt din enhed"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskyt din telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurer en alternativ metode til skærmlåsning for at opnå ekstra sikkerhed."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode eller adgangskode. Konfigurer en ekstra låseskærm for at være sikker."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Tilpasset lysstyrke"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimer lysstyrken til det omgivende lys"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nattelys"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Med Nattelys får skærmen en rød farvetone. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planlæg"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Med Nattelys får skærmen en rød farvetone om natten. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktivér automatisk"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldrig"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Tilpasset plan"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 866d846..79eb2bd 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -354,7 +354,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Löschen"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Los geht\'s"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Los geht\'s!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Lege deinen Finger auf den Sensor und hebe ihn an, wenn du eine Vibration spürst."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Berühre den Sensor noch einmal"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bewege deinen Finger etwas, um alle unterschiedlichen Teile deines Fingerabdrucks hinzuzufügen."</string>
@@ -424,7 +424,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tablet schützen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Gerät schützen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Smartphone schützen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Richte eine alternative Displaysperre ein, um die Sicherheit zu erhöhen."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster, eine PIN oder ein Passwort. Richte eine alternative Displaysperre ein, um die Sicherheit zu erhöhen."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive Helligkeit"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helligkeit an Lichtverhältnisse anpassen"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nachtlicht"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Beim Nachtlicht wird das Display rot getönt. Dadurch kannst du den Bildschirm bei schwachem Licht leichter lesen und er wirkt beim Einschlafen nicht störend."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planen"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Beim Nachtlicht wird das Display rot getönt. Dadurch kannst du den Bildschirm bei schwachem Licht leichter lesen und er wirkt beim Einschlafen nicht störend."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatisch aktivieren"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nie"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Benutzerdefinierter Zeitplan"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7aca88b..2c208e4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Όνομα"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ΟΚ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Διαγραφή"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Ας ξεκινήσουμε"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Ας ξεκινήσουμε!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Τοποθετήστε το δάχτυλό σας στον αισθητήρα και ανασηκώστε το μόλις αισθανθείτε μια δόνηση"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Συνέχεια"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Κουνήστε ελαφρώς το δάχτυλό σας για να προσθέσετε όλα τα διαφορετικά τμήματα του δαχτυλικού σας αποτυπώματος"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Προστατέψτε το tablet σας"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Προστατέψτε τη συσκευή σας"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Προστασία τηλεφώνου"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Για πρόσθετη ασφάλεια, ρυθμίστε μια εφεδρική μέθοδο κλειδώματος οθόνης"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Το δακτυλικό σας αποτύπωμα ενδέχεται να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο, κάποιο PIN ή έναν κωδικό πρόσβασης. Για επιπλέον ασφάλεια, ορίστε ένα εφεδρικό κλείδωμα οθόνης."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Αποτρέψτε άλλους από τη χρήση αυτής της συσκευής χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Αποτρέψτε άλλους από τη χρήση αυτού του τηλεφώνου χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Προσαρμοστική φωτεινότητα"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Βελτιστοποίηση του επιπέδου φωτεινότητας για το διαθέσιμο φως"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Νυχτερινός φωτισμός"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Ο Νυχτερινός φωτισμός αλλάζει το χρώμα της οθόνης σας σε κόκκινο. Αυτό κάνει πιο εύκολη την ανάγνωση της οθόνης σε χαμηλό φωτισμό και μπορεί να σας βοηθήσει να αποκοιμηθείτε πιο εύκολα."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Πρόγραμμα"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Κατάσταση"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Ο Νυχτερινός φωτισμός αλλάζει το χρώμα της οθόνης σας σε κόκκινο κατά τη διάρκεια της νύχτας. Αυτό κάνει πιο εύκολη την ανάγνωση της οθόνης σε χαμηλό φωτισμό και μπορεί να σας βοηθήσει να αποκοιμηθείτε πιο εύκολα."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Αυτόματη ενεργοποίηση"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ποτέ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Προσαρμοσμένος προγραμματισμός"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6535385..7737f44 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Let’s start"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Let\'s start!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Your fingerprint may be less secure than a strong pattern, PIN or password. For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Night Light tints your screen red. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Night Light tints your screen red at night. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Turn on automatically"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Never"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Customised schedule"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6535385..7737f44 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Let’s start"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Let\'s start!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Your fingerprint may be less secure than a strong pattern, PIN or password. For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Night Light tints your screen red. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Night Light tints your screen red at night. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Turn on automatically"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Never"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Customised schedule"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6535385..7737f44 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Let’s start"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Let\'s start!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protect your tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protect your phone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"For added security, set up a backup screen lock."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Your fingerprint may be less secure than a strong pattern, PIN or password. For added security, set up a backup screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Night Light tints your screen red. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Night Light tints your screen red at night. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Turn on automatically"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Never"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Customised schedule"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2c1317b..7c86248 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Borrar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Comencemos"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"¡Comencemos!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para agregar todas las partes de tu huella digital."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protege tu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protege tu dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protege el teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para mayor seguridad, establece un bloqueo de pantalla secundario"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Tu huella digital puede ser menos segura que un patrón, un PIN o una contraseña eficaces. Configura un bloqueo de pantalla para mayor seguridad."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"La Luz nocturna le da un tono rojizo a la pantalla. No solo te permitirá ver mejor en lugares con luz tenue, sino que también podría ayudarte a dormir más rápido."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"La Luz nocturna le da un tono rojizo a la pantalla durante la noche. No solo te permitirá ver mejor en lugares con luz tenue, sino que también podría ayudarte a dormir más rápido."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activar automáticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programación personalizada"</string>
@@ -2537,7 +2535,7 @@
     <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="sound_settings_summary" msgid="4100853606668287965">"Volumen de tono: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"Volumen de tono: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumen de tono: 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volumen multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index eabf068..d8c6f70 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"¡Empecemos!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"¡Empecemos!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Pon el dedo en el sensor y levántalo cuando notes una vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para añadir todas las partes de tu huella digital."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protege tu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protege tu dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protege tu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para mayor seguridad, configura un bloqueo de pantalla para la copia de seguridad."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Es posible que la huella digital sea menos segura que un buen patrón, PIN o contraseña. Configura un bloqueo de pantalla alternativo para mayor protección."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
@@ -904,9 +904,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"La luz nocturna da un tono rojizo a la pantalla. De esta forma, es más fácil ver la pantalla con poca luz y quedarte dormido."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"La luz nocturna da un tono rojizo a la pantalla por la noche. De esta forma, es más fácil ver la pantalla con poca luz y quedarte dormido."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activar automáticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programación personalizada"</string>
@@ -3020,7 +3018,7 @@
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabajo desactivado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Las aplicaciones, la sincronización en segundo plano y otras funciones relacionadas con tu perfil de trabajo están desactivadas."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Luz nocturna activada"</string>
-    <string name="condition_night_display_summary" msgid="6156601053674688864">"La pantalla tiene un tono rojizo que puede ayudarte a conciliar el sueño."</string>
+    <string name="condition_night_display_summary" msgid="6156601053674688864">"La pantalla tiene un tono rojizo que te ayudará a conciliar el sueño."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"Más de <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Quitar"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index aec2b44..cac7445 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nimi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Kustuta"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Alustame"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Alustame!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Asetage oma sõrm andurile ja tõstke see üles, kui tunnete vibratsiooni"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Jätkake"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Liigutage veidi oma sõrme, et lisada oma sõrmejälje kõik erinevad osad"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tahvelarvuti kaitsmine"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Seadme kaitsmine"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefoni kaitsmine"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Lisaturvalisuse jaoks seadistage varuekraanilukk."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Teie sõrmejälg võib olla vähem turvaline kui tugev muster, PIN-kood või parool. Lisaturvalisuse jaoks seadistage varuekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kohanduv heledus"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Heleduse optimeerimine valgustingimuste järgi"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Öövalgus"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Funktsioon Öövalgus toonib ekraani punaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil hõlpsamini magama jääda."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ajastamine"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Olek"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Funktsioon Öövalgus toonib ekraani öösel punaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil hõlpsamini magama jääda."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Lülita automaatselt sisse"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Mitte kunagi"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Kohandatud ajakava"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 23362f0..d886528 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Izena"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ados"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ezabatu"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Has gaitezen!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Ekiogun!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ezarri hatza sentsorean eta, dardara sentitzen duzunean, jaso ezazu"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Ez gelditu"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mugitu hatza pixka bat, hatz-markaren zati guztiak gehitzeko"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Babestu tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Babestu gailua"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Babestu telefonoa"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Hatz-marka ez da eredu, PIN edo pasahitz konplexu bat bezain segurua. Babestuago egoteko, konfiguratu pantaila blokeatzeko ordezko metodo bat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Distira doigarria"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizatu pantailaren distira inguruko argitasunaren arabera"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Gaueko argia"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Gaueko argiak tindu gorriz janzten du pantaila. Horrela, ez zaizu horren nekagarria egingo argi gutxirekin pantailari begira egotea eta errazago hartuko duzu lo, gainera."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Antolaketa"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Egoera"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Gaueko argiak tindu gorriz janzten du pantaila gauean. Horrela, ez zaizu horren nekagarria egingo argi gutxirekin pantailari begira egotea eta errazago hartuko duzu lo, gainera."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktibatu automatikoki"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Inoiz ez"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ordutegi pertsonalizatua"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3f222b1..1cfa5c6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"تأیید"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"بیایید شروع کنیم"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"شروع می‌کنیم!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"انگشتتان را روی حسگر بگذارید و بعد از احساس لرزش، آن را بردارید"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ادامه دهید"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"اندکی انگشتتان را حرکت دهید تا همه قسمت‌های متفاوت اثر انگشتتان اضافه شود"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"محافظت از رایانه لوحی"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"محافظت از دستگاه"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"از تلفنتان محافظت کنید"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"برای امنیت بیشتر، قفل صفحه پشتیبانی تنظیم کنید."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ممکن است ایمنی اثر انگشت از ایمنی الگو، پین یا گذرواژه‌ای قوی کمتر باشد. برای ایمنی بیشتر، قفل صفحه پشتیبان تنظیم کنید."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این رایانه لوحی استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"روشنایی تطبیقی"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"بهینه‌سازی سطح روشنایی برای نور در دسترس"</string>
     <string name="night_display_title" msgid="2626451512200357686">"نور شب"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"«نور شب» سایه‌رنگ قرمزی به صفحه‌نمایش شما می‌بخشد. این کار باعث می‌شود نگاه کردن به صفحه در نور کم آسان‌تر شود و ممکن است کمک کند آسان‌تر به خواب بروید."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"زمان‌بندی"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"وضعیت"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"«نور شب» سایه‌رنگ قرمزی به صفحه‌نمایش شما در شب می‌بخشد. این کار باعث می‌شود نگاه کردن به صفحه در نور کم آسان‌تر شود و می‌تواند کمک کند آسان‌تر به خواب بروید."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"روشن شدن خودکار"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"هیچ‌وقت"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"سفارشی کردن زمان‌بندی"</string>
@@ -1263,7 +1261,7 @@
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"‏دستیار Wi‑Fi را تغییر می‌دهید؟"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"از <xliff:g id="NEW_APP">%1$s</xliff:g> به‌جای <xliff:g id="CURRENT_APP">%2$s</xliff:g> استفاده می‌کنید تا ارتباطات شبکه‌تان را مدیریت کنید؟"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"برای مدیریت ارتباطات شبکه‌تان از <xliff:g id="NEW_APP">%s</xliff:g> استفاده می‌کنید؟"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"اپراتور سیم‌کارت ناشناس"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"اپراتور سیم‌کارت ناشناخته"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏%1$s وب‌سایت شناخته‌شده‌ای برای آماده‌سازی ندارد."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"لطفاً سیم کارت را وارد کنید و دوباره راه‌اندازی کنید"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"لطفاً به اینترنت وصل شوید"</string>
@@ -2803,7 +2801,7 @@
     <string name="filter_notif_silent" msgid="8533960664617048281">"نمایش به‌صورت بی‌صدا"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="configure_apps" msgid="6685680790825882528">"پیکربندی برنامه‌ها"</string>
-    <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناس"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
     <string name="app_permissions" msgid="4148222031991883874">"مجوزهای برنامه"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه اجازه دسترسی اضافی دارد"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه مجاز است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f68f40c..c565c0c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nimi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Poista"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Aloitetaan"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Aloitetaan!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Aseta sormesi tunnistimelle ja nosta se, kun tunnet värähdyksen."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Jatka koskettamista"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lisää sormenjälkesi kokonaisuudessaan liikuttamalla sormeasi varovasti."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tabletin suojaaminen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Laitteen suojaaminen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Suojaa puhelintasi"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Paranna suojausta määrittämällä näytön varalukitustapa."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio, PIN-koodi tai salasana. Paranna suojausta lisäämällä näytön varalukitustapa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kirkkauden säätö"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Näytön kirkkaus määräytyy valoisuuden mukaan."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Yövalo"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Yövalo tekee näytöstä punasävyisen. Sen avulla näytön katselu heikossa valossa on helpompaa ja saatat nukahtaa helpommin."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Aikataulu"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Tila"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Yövalo tekee näytöstä yöllä punasävyisen. Sen avulla näytön katselu heikossa valossa on helpompaa ja saatat nukahtaa helpommin."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ota käyttöön automaattisesti"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ei koskaan"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Muokattu aikataulu"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9acb8bc..e334284 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Commençons"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Commençons!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le capteur, puis soulevez-le lorsque vous sentez une vibration."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protégez votre tablette"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protégez votre appareil"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Vos empreintes digitales peuvent être moins sécuritaires qu\'un schéma ou un NIP fiable. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosité adaptative"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Éclairage nocturne"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Le mode Éclairage nocturne donne une teinte de rouge à votre écran. Cela vous permet de le regarder plus facilement lorsque l\'éclairage est faible et peut vous aider à vous endormir plus facilement."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Calendrier"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"État"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Le mode Éclairage nocturne donne une teinte de rouge à votre écran pendant la nuit. Cela vous permet de le regarder plus facilement lorsque l\'éclairage est faible et peut vous aider à vous endormir plus facilement."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activer automatiquement"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jamais"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Horaire personnalisé"</string>
@@ -3022,7 +3020,7 @@
     <string name="condition_work_title" msgid="7293722361184366648">"Profil professionnel désactivé"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Les applications, la synchronisation en arrière-plan et d\'autres fonctionnalités liées à votre profil professionnel sont désactivées."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Éclairage nocturne activé"</string>
-    <string name="condition_night_display_summary" msgid="6156601053674688864">"L\'écran a une teinte rouge. Cela peut vous aider à vous endormir."</string>
+    <string name="condition_night_display_summary" msgid="6156601053674688864">"Écran a une teinte rouge. Cela peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1684f59..d9ef92b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Commencer"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Commencer"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le lecteur, puis soulevez-le lorsque vous sentez une vibration."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protéger la tablette"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protéger l\'appareil"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protégez votre téléphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma, un code d\'accès ou un mot de passe fiables. Pour plus de sécurité, configurez une méthode alternative pour verrouiller l\'écran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptation de la luminosité"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiser le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Éclairage nocturne"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"L\'éclairage nocturne colore votre écran en rouge. Cela vous permet de le regarder ou de lire plus facilement lorsque l\'éclairage est faible, et peut vous aider à vous endormir."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planifier"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"État"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"L\'éclairage nocturne colore votre écran en rouge pendant la nuit. Cela vous permet de le regarder ou de lire plus facilement lorsque l\'éclairage est faible, et peut vous aider à vous endormir."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activer automatiquement"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jamais"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Calendrier diffusion person."</string>
@@ -2576,7 +2574,7 @@
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sur l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu des notifications sensibles"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"N\'afficher aucune notification"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications s\'affichent ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
@@ -2930,12 +2928,12 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"Aucune"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"Désactiver l\'accès aux données d\'utilisation pour cette application n\'empêchera pas votre administrateur d\'effectuer le suivi de la consommation des données pour les applications de votre profil professionnel."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> caractères utilisés sur <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="draw_overlay_title" msgid="4003905926278954971">"Applis superposables aux autres"</string>
+    <string name="draw_overlay_title" msgid="4003905926278954971">"Applis pouvant se superposer aux autres applis"</string>
     <string name="draw_overlay" msgid="9078696044299199938">"Se superposer aux autres applis"</string>
     <string name="system_alert_window_settings" msgid="1757821151143694951">"Se superposer aux autres applications"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Applications"</string>
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"Se superposer aux autres applications"</string>
-    <string name="permit_draw_overlay" msgid="6606018549732046201">"Autoriser superposition sur autres applis"</string>
+    <string name="permit_draw_overlay" msgid="6606018549732046201">"Autoriser la superposition sur autres applis"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Autorisation de superposition des applications"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"Cette autorisation permet à une application de se superposer à d\'autres applications que vous utilisez. Cela peut entraîner des interférences lorsque vous utilisez l\'interface de n\'importe quelle application, ou modifier ce que vous pensez voir dans ces dernières."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr réalité virtuelle écouteur service de soutien stéréo"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 5b13d4c..af601c6 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Comecemos"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Comecemos"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca o dedo no sensor e levántao cando notes unha vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Volve tocalo"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move suavemente o dedo para engadir todas as partes diferentes da túa impresión dixital."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protexe a tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protexe o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protexe o teu teléfono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Configura un bloqueo da pantalla alternativo para conseguir unha maior seguranza."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"É posible que a túa impresión dixital sexa menos segura que un padrón, PIN ou contrasinal fiables. Configura un bloqueo da pantalla alternativo para unha maior seguranza."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activa as funcións de protección da tableta para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo adaptable"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiza o nivel de brillo en función da luz dispoñible"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"A función Luz nocturna dálle un ton vermello á pantalla pola noite para que che resulte máis fácil mirala con pouca luz e che axude a coller o sono."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar horario"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"A función Luz nocturna dálle un ton vermello á pantalla pola noite para que che resulte máis fácil mirala con pouca luz e che axude a coller o sono."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activar automaticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programación personalizada"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index a3d02e1..42ff629 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"નામ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ઓકે"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"કાઢી નાખો"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ચાલો શરૂ કરીએ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ચાલો શરૂ કરીએ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"સેન્સર પર તમારી આંગળી મૂકો અને વાઇબ્રેશનનો અનુભવ થવા પર ઉઠાવી લો"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ચાલુ રાખો"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"તમારી ફિંગરપ્રિન્ટના તમામ ભિન્ન ભાગોને ઉમેરવા માટે તમારી આંગળીને સહેજ ખસેડો"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ટેબ્લેટની સુરક્ષા કરો"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ઉપકરણને સુરક્ષિત કરો"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ફોનની સુરક્ષા કરો"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"વધારાની સુરક્ષા માટે, એક બેકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન, PIN અથવા પાસવર્ડ કરતાં ઓછી સુરક્ષિત હોઈ શકે છે. વધારાની સુરક્ષા માટે, એક બેકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"અનુકૂલન તેજ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ઉપલબ્ધ પ્રકાશ માટેનાં તેજ સ્તરને ઓપ્ટિમાઇઝ કરો"</string>
     <string name="night_display_title" msgid="2626451512200357686">"રાત્રિ પ્રકાશ"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"રાત્રિ પ્રકાશ, તમારી સ્ક્રીન પર લાલ રંગછટા કરી દે છે. આ મંદ પ્રકાશમાં તમારી સ્ક્રીન પર જોવાનું અથવા વાંચવાનું સરળ બનાવે છે અને વધુ સહેલાઈથી ઊંઘવામાં તમારી સહાય કરી શકે છે."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"શેડ્યૂલ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"સ્થિતિ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"રાત્રિ પ્રકાશ, રાત્રે તમારી સ્ક્રીન પર લાલ રંગછટા કરી દે છે. આ મંદ પ્રકાશમાં તમારી સ્ક્રીન પર જોવાનું અથવા વાંચવાનું સરળ બનાવે છે અને વધુ સહેલાઈથી ઊંઘવામાં તમારી સહાય કરી શકે છે."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"આપમેળે ચાલુ કરો"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ક્યારેય નહીં"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"કસ્ટમ શેડ્યૂલ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b2f170f..8ee1a48 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटाएं"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"आइए शुरू करें"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"आइए प्रारंभ करें!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी अंगुली संवेदक पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"अपने फ़िंगरप्रिंट के सभी भिन्न भागों को जोड़ने के लिए अपनी अंगुली को धीरे से हिलाएं"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"टैबलेट की सुरक्षा करें"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"डिवाइस की सुरक्षा करें"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"फ़ोन को सुरक्षित रखें"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"अतिरिक्त सुरक्षा के लिए, बैकअप स्‍क्रीन लॉक सेट करें."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न, पिन या पासवर्ड की तुलना में कम सुरक्षित हो सकता है. अतिरिक्त सुरक्षा के लिए, एक बैकअप स्क्रीन लॉक सेट करें."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस टैबलेट का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"स्क्रीन की रोशनी ठीक करें"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"अपने हिसाब से स्क्रीन की रोशनी ठीक करें"</string>
     <string name="night_display_title" msgid="2626451512200357686">"नाइट लाइट"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"नाइट लाइट आपकी स्क्रीन को हल्की लाल कर देती है. इससे मंद रोशनी में अपनी स्क्रीन देखना या पढ़ना आसान हो जाता है और आपको आसानी से नींद आने में सहायता मिल सकती है."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"शेड्यूल करें"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"स्थिति"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"नाइट लाइट रात्रि के समय आपकी स्क्रीन को हल्की लाल कर देती है. इससे मंद रोशनी में अपनी स्क्रीन देखना या पढ़ना आसान हो जाता है और आपको आसानी से नींद आने में सहायता मिल सकती है."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"अपने आप चालू करें"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"कभी नहीं"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"कस्टम शेड्यूल"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9e02567..e51647c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -358,7 +358,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Počnimo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Počnimo!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kada osjetite vibraciju"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lagano pomaknite prst da biste ostavili potpuni otisak prsta"</string>
@@ -428,7 +428,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite svoj uređaj"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaštitite telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Otisak prsta može biti manje siguran od snažnog uzorka, PIN-a ili zaporke. Za dodatnu sigurnost postavite pričuvno zaključavanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
@@ -915,9 +915,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svjetlina"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje jačine osvjetljenja u odnosu na osvijetljenost okoline"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svjetlo"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Noćno svjetlo boji zaslon uređaja crveno. To olakšava gledanje zaslona i čitanje pri slabom svjetlu i može vam pomoći da lakše zaspite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Raspored"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Noćno svjetlo noću boji zaslon uređaja crveno. To olakšava gledanje zaslona i čitanje pri slabom svjetlu i može vam pomoći da lakše zaspite."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Uključi automatski"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikad"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Prilagođeni raspored"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e9d2d36..44a8ebc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Név"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Törlés"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Lásson neki!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Lássunk neki!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Helyezze az ujját az érzékelőre, és emelje fel a rezgést követően"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Folytassa"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Óvatosan mozgassa ujját a teljes ujjlenyomat levételéhez"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Óvja meg táblagépét"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Óvja meg eszközét"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Óvja meg telefonját"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"A nagyobb biztonság érdekében állítson be másodlagos képernyőzárat."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Az ujjlenyomat kevésbé biztonságos lehet, mint egy bonyolult minta, PIN-kód vagy jelszó. A nagyobb biztonság kedvéért állítson be tartalék képernyőzárat."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a táblagépet. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Alkalmazkodó fényerő"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Fényerőszint optimalizálása a környezeti fény alapján"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Éjszakai fény"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Az Éjszakai fény vöröses árnyalatúra színezi a képernyőt, hogy gyenge fény mellett se legyen kellemetlen a képernyőre nézni. Emellett az elalvást is megkönnyítheti."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ütemezés"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Állapot"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Az Éjszakai fény éjszaka vöröses árnyalatúra színezi képernyőjét, hogy gyenge fény mellett se legyen kellemetlen a képernyőre nézni. Emellett a funkció az elalvást is megkönnyítheti."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatikus bekapcsolás"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Soha"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Egyéni ütemezés"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 771251a..0411f26 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Անուն"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Լավ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ջնջել"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Սկսե՛նք"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Սկսե՛նք:"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Դրեք ձեր մատը սենսորի վրա և բարձրացրեք թրթռոց զգալուց հետո"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Շարունակեք"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Մի փոքր շարժեք ձեր մատը՝ մատնահետքի բոլոր մասերը հավելելու համար"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Պաշտպանեք ձեր պլանշետը"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Պաշտպանեք ձեր սարքը"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Պաշտպանեք ձեր հեռախոսը"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ավելի ապահով լինելու համար սահմանեք էկրանի կողպման պահուստային եղանակ:"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Ապակողպման հուսալի նախշը, PIN կոդը կամ գաղտնաբառը կարող է մատնահետքից ավելի ապահով լինել: Ավելի ապահով լինելու համար սահմանեք էկրանի կողպման պահուստային եղանակ:"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Կանխեք այս պլանշետի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Կանխեք այս սարքի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Կանխեք այս հեռախոսի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Հարմարողական պայծառություն"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Լույսի պայծառության մակարդակի լավարկում"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Գիշերային լույս"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Գիշերային լույսը կարմիր երանգ է հաղորդում էկրանին: Դա թույլ է տալիս ավելի հանգիստ նայել էկրանին կամ կարդալ խավար լուսավորության պայմաններում և չի խանգարում քնելուն:"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ժամանակացույց"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Կարգավիճակ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Գիշերային լույսը գիշերը կարմիր երանգ է հաղորդում էկրանին: Դա թույլ է տալիս ավելի հանգիստ նայել էկրանին և չի խանգարում քնելուն:"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Միացնել ավտոմատ կերպով"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Երբեք"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Անհատականացված ժամանակացույց"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 04ea311..17fabb3 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Oke"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Hapus"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Ayo mulai"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Ayo mulai!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Letakkan jari Anda di sensor dan angkat setelah merasakan getaran"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Gerakkan jari Anda sedikit untuk menambahkan semua bagian lain dari sidik jari Anda"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Lindungi tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Lindungi perangkat"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Lindungi ponsel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Untuk tambahan keamanan, siapkan kunci layar cadangan."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Sidik jari mungkin kurang aman dibanding pola, PIN, atau sandi yang rumit. Untuk tambahan keamanan, siapkan kunci layar cadangan."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cegah orang lain menggunakan tablet ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan adaptif"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Mengoptimalkan tingkat kecerahan untuk cahaya yang tersedia"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Cahaya Malam"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Cahaya Malam memberi rona merah pada layar. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Jadwal"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Cahaya Malam memberi rona merah pada layar di malam hari. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktifkan otomatis"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jangan pernah"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Jadwal khusus"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 559f647..313c0e8 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Heiti"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Í lagi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eyða"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Við skulum byrja"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Við skulum byrja!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Settu fingurinn á skynjarann og lyftu honum þegar þú finnur titring"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Haltu áfram"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Færðu fingurinn svolítið til að bæta við mismunandi hlutum fingrafarsins"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Auktu öryggi spjaldtölvunnar"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Auktu öryggi tækisins"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Auktu öryggi símans"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Hugsanlegt er að notkun fingrafara sé ekki jafnörugg og mynstur, PIN-númer eða aðgangsorð. Settu upp skjálás til vara til að gæta fyllsta öryggis."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aðlögun birtustigs"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Stilla birtustig eftir umhverfisbirtu"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Næturljós"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Næturljós gefur skjánum rauðan litblæ. Þetta gerir þér auðveldara að skoða skjáinn í litlu ljósi og gæti gert þér auðveldara fyrir að sofna."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Dagskrá"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Staða"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Næturljós gefur skjánum rauðan litblæ á næturnar. Þetta gerir þér auðveldara að skoða skjáinn í litlu ljósi og gæti gert þér auðveldara fyrir að sofna."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Kveikja sjálfkrafa"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldrei"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Sérsniðin dagskrá"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e535a2f..9d9e3ff 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Elimina"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Inizia"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Inizia"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Appoggia il dito sul sensore e sollevalo quando sentirai una vibrazione"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continua a toccare"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Muovi leggermente il dito per aggiungere tutte le diverse parti della tua impronta digitale"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteggi il tuo tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteggi dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteggi il telefono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Per maggiore sicurezza, imposta un blocco schermo di backup."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"L\'impronta digitale potrebbe essere meno sicura di una sequenza, una password o un PIN complesso. Per sicurezza, configura una schermata di blocco alternativa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosità adattiva"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Ottimizza il livello di luminosità per la luce disponibile"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luminosità notturna"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Con la funzione Luminosità notturna, il tuo schermo diventa rosso. In questo modo potrai guardarlo senza sforzare la vista o leggere in condizioni di luce attenuata e potrai addormentarti più facilmente."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Pianificazione"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stato"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Con la funzione Luminosità notturna, di notte il tuo schermo diventa rosso. In questo modo potrai guardarlo senza sforzare la vista o leggere in condizioni di luce attenuata e potrai addormentarti più facilmente."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Attiva automaticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Mai"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Pianificazione personalizzata"</string>
@@ -2930,7 +2928,7 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"Nessuna"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"La disattivazione dell\'accesso all\'utilizzo per questa app non impedisce all\'amministratore di tracciare l\'utilizzo dei dati delle app nel tuo profilo di lavoro."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> caratteri su <xliff:g id="COUNT_1">%2$d</xliff:g> utilizzati"</string>
-    <string name="draw_overlay_title" msgid="4003905926278954971">"App visualizzabili su altre app"</string>
+    <string name="draw_overlay_title" msgid="4003905926278954971">"App che possono essere spostate su altre app"</string>
     <string name="draw_overlay" msgid="9078696044299199938">"Spostamento su altre app"</string>
     <string name="system_alert_window_settings" msgid="1757821151143694951">"Spostamento su altre app"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"App"</string>
@@ -3075,7 +3073,7 @@
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Non attivare mai automaticamente"</string>
-    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Attiva automaticamente al %1$s di batteria"</string>
+    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Attiva automaticamente al %1$s%% di batteria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Ottimizzazione della batteria non in uso"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Impedisci di digitare risposte o altro testo nelle notifiche quando il dispositivo è bloccato"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Controllo ortografico predef."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 7cf6faf..22fd395 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"שם"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"אישור"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחק"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"בוא נתחיל"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"אפשר להתחיל!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"הזז מעט את האצבע כדי להוסיף את כל החלקים של טביעת האצבע"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"הגן על הטאבלט שלך"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"הגן על המכשיר שלך"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"הגן על הטלפון שלך"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"להגברת האבטחה, הגדר נעילת מסך לגיבוי."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"טביעת האצבע עשויה להיות בטוחה פחות מאשר קו ביטול נעילה, קוד גישה או סיסמה חזקים. הגדר נעילת מסך כגיבוי ליתר ביטחון."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטאבלט הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש במכשיר הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטלפון הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"בהירות מותאמת"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"התאם את רמת הבהירות ביחס לתאורה הזמינה"</string>
     <string name="night_display_title" msgid="2626451512200357686">"תאורת לילה"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"תאורת הלילה מעניקה למסך גוון אדום בשעת לילה. כך יהיה לך קל יותר להביט במסך או לקרוא באור מעומעם, ויהיה לך קל יותר להירדם."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"לוח זמנים"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"סטטוס"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"תאורת הלילה מעניקה למסך גוון אדום בשעת לילה. כך יהיה לך קל יותר להביט במסך או לקרוא באור חלש, ויהיה לך קל יותר להירדם."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"הפעל באופן אוטומטי"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"אף פעם"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"תזמון מותאם אישית"</string>
@@ -2003,12 +2001,12 @@
     <string name="credentials_install" product="default" msgid="953914549998062317">"‏התקן מכרטיס SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"התקן אישורים מאמצעי אחסון"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"‏התקן אישורים מכרטיס SD"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"נקה פרטי כניסה"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"נקה אישורים"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"פרטי כניסה מהימנים"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"‏הצג אישורי CA מהימנים"</string>
     <string name="user_credentials" msgid="3719013347787187083">"פרטי משתמש"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"הצגה ועריכה של פרטי כניסה מאוחסנים"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"הצגה ועריכה של פרטים מאוחסנים"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"מתקדם"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"סוג אחסון"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"מגובה באמצעות חומרה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1c02dca..f73c657 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名前"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"削除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"登録の開始"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"登録の開始"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"指をセンサーに当て、振動したら離します。"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"もう一度触れてください"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"指を少しずつ動かして、指紋全体を登録します。"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"タブレットの保護"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"端末の保護"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"スマートフォンの保護"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"セキュリティを強化するには、予備の画面ロック方式を設定してください。"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"指紋は、複雑なパターン、PIN、パスワードよりも安全面で劣る可能性があります。セキュリティを強化するには、予備の画面ロック方式を設定してください。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"このタブレットが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"この端末が他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"このスマートフォンが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"明るさの自動調節"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"周囲に合わせて明るさを最適化する"</string>
     <string name="night_display_title" msgid="2626451512200357686">"読書灯"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"読書灯を利用すると画面を赤みがかった色にできます。薄暗い明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"スケジュール"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ステータス"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"読書灯を利用すると夜間に画面を赤みがかった色にできます。薄暗い明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自動的に ON"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"設定しない"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"カスタム スケジュール"</string>
@@ -2541,7 +2539,7 @@
     <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="sound_settings_summary" msgid="4100853606668287965">"着信音の音量: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"着信音の音量: <xliff:g id="PERCENTAGE">%1$s</xliff:g>%%"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"着信音の音量: 80%%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"メディアの音量"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"アラームの音量"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 3cbada5..d973e38 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"სახელი"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"კარგი"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"წაშლა"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"დავიწყოთ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"დავიწყოთ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"დაადეთ თითი სენსორს და ვიბრაციის შეგრძნების შემდეგ აიღეთ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"გააგრძელეთ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"თქვენი თითის ანაბეჭდის სხვადასხვა ნაწილის დასამატებლად თითი ოდნავ გადააადგილეთ"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"თქვენი ტაბლეტის დაცვა"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"თქვენი მოწყობილობის დაცვა"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"დაიცავით ტელეფონი"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"დამატებითი უსაფრთხოებისთვის, დააყენეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"თქვენი თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე, PIN-კოდზე ან პაროლზე ნაკლებად საიმედო იყოს. დააყენეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტაბლეტი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს მოწყობილობა ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტელეფონი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"მორგებადი სიკაშკაშე"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"სიკაშკაშის არსებულ სინათლეზე მორგება"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ღამის განათება"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"ღამის განათება თქვენს ეკრანს ღამის პერიოდში წითელ ელფერს მიანიჭებს. მკრთალი სინათლე გაგიმარტივებთ ეკრანზე კითხვას ან ყურებას და უფრო სწრაფად დაძინებაში დაგეხმარებათ."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"განრიგი"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"სტატუსი"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"ღამის განათება თქვენს ეკრანს წითელ ელფერს მიანიჭებს. მკრთალი სინათლე გაგიმარტივებთ ეკრანზე კითხვას ან ყურებას და უფრო სწრაფად დაძინებაში დაგეხმარებათ."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ავტომატურად ჩართვა"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"არასოდეს"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"მორგებული განრიგი"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index e272a56..be88536 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Аты"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Жарайды"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жою"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Бастайық"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Бастайық!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Саусақты сенсорға қойып, дірілді сезгеннен кейін көтеріңіз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Тағы бір рет түртіңіз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Саусақ ізінің әр түрлі бөліктерінің барлығын қосу үшін саусақты азғантай жылжытыңыз"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Планшетті қорғау"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Құрылғыны қорғау"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Телефонды қорғау"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Қауіпсіздік деңгейін арттыру үшін экранды құлыптаудың қосымша жолын орнатыңыз."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Саусақ ізінің қауіпсіздігі күшті өрнектен, PIN кодынан немесе құпия сөзден азырақ болуы мүмкін. Қауіпсіздікті арттыру үшін қосалқы экран құлпын реттеңіз."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"құрылғы қорғау мүмкіндіктерін іске қосу арқылы сіздің рұқсатыңызсыз планшетті басқалардың пайдалануына жол бермеңіз. Пайдаланғыңыз келетін экран құлпын таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы құрылғыны рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы телефонды рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Бейімделгіш жарықтық"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Ортадағы жарықтандыруға сәйкес жарықтық деңгейін оңтайландыру"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Түнгі жарық"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"\"Night Light\" функциясы экраныңызға қызыл реңк береді. Ол қараңғыда экранға қарауды жеңілдетеді әрі жылдам ұйықтауға да көмектесуі мүмкін."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Уақыт кестесі"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Күй"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Түнгі жарық функциясы түн мезгілінде экраныңызға қызыл реңк береді. Онымен қараңғы түнде экранға қараған жеңілірек, жылдам ұйықтауға да көмектесуі мүмкін."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматты түрде қосу"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ешқашан"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Арнаулы кесте"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3e6a2ba..0f3a505 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ឈ្មោះ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"យល់ព្រម"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"លុប"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"តោះចាប់ផ្តើម!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"តោះចាប់ផ្តើម!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ដាក់ម្រាមដៃរបស់អ្នកនៅលើឧបករណ៍ចាប់សញ្ញា ហើយលើកវាឡើងបន្ទាប់ពីអ្នកមានអារម្មណ៍ថាវាញ័រហើយ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"បន្តធ្វើ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ផ្លាស់ទីម្រាមដៃរបស់អ្នកបន្តិចដើម្បីបន្ថែមផ្នែកផ្សេងទៀតទាំងអស់នៃម្រាមដៃរបស់អ្នក"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ការពារថេប្លេតរបស់អ្នក"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ការពារឧបករណ៍របស់អ្នក"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ការពារទូរស័ព្ទរបស់អ្នក"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ដើម្បីទទួលបានសុវត្ថិភាពបន្ថែម សូមដំឡើងការចាក់សោអេក្រង់បម្រុង។"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ស្នាមម្រាមដៃរបស់អ្នកអាចនឹងមិនសូវមានសុវត្ថិភាពដូចលំនាំ កូដ PIN ឬពាក្យសម្ងាត់ដែលរឹងមាំនោះទេ។ សម្រាប់សុវត្ថិភាពបន្ថែម សូមដំឡើងអេក្រង់ចាក់សោបម្រុង។"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើថេប្លេតនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើឧបករណ៍នេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ពន្លឺ​​ដែល​ចេះសម្រប​ខ្លួន"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"កែសម្រួល​កម្រិត​ពន្លឺ​​តាម​ពន្លឺ​ដែល​មាន"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ពន្លឺពេលយប់"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"ពន្លឺពេលយប់ធ្វើឲ្យអេក្រង់របស់អ្នកមានពណ៌ក្រហមព្រឿងៗនៅពេលយប់។ វាធ្វើឲ្យមានភាពងាយស្រួលជាងមុនក្នុងការមើលអេក្រង់របស់អ្នក ឬដើម្បីអាននៅកន្លែងដែលមានពន្លឺស្រអាប់ ហើយវាអាចជួយឲ្យអ្នកឆាប់គេងលក់។"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"កាលវិភាគ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ស្ថានភាព"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"ពន្លឺពេលយប់ធ្វើឲ្យអេក្រង់របស់អ្នកមានពណ៌ក្រហមព្រឿងៗនៅពេលយប់។ វាធ្វើឲ្យមានភាពងាយស្រួលជាងមុនក្នុងការមើលអេក្រង់របស់អ្នក ឬដើម្បីអាននៅកន្លែងដែលមានពន្លឺស្រអាប់ ហើយវាអាចជួយឲ្យអ្នកឆាប់គេងលក់។"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"បើកដោយស្វ័យប្រវត្តិ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"កុំ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"កាលវិភាគផ្ទាល់ខ្លួន"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 4ef643f..c02941e 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ಹೆಸರು"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ಸರಿ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ಅಳಿಸಿ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ಇದೀಗ ಪ್ರಾರಂಭಿಸೋಣ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ಇದೀಗ ಪ್ರಾರಂಭಿಸೋಣ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಬೆರಳಿರಿಸಿ ಮತ್ತು ನಿಮಗೆ ವೈಬ್ರೇಷನ್ ಅನುಭವ ಆದ ನಂತರ ತೆಗೆಯಿರಿ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ಮುಂದುವರಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ಎಲ್ಲಾ ವಿವಿಧ ಭಾಗಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ವಲ್ಪಮಟ್ಟಿಗೆ ಸರಿಸಿ"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ರಕ್ಷಿಸಿ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಿ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ಬ್ಯಾಕಪ್‌ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ಬಲವಾದ ಪ್ಯಾಟರ್ನ್, ಪಿನ್, ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ಗಳಿಗೆ ಹೋಲಿಸಿದರೆ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅಷ್ಟೇನು ಸುರಕ್ಷಿತವಲ್ಲ. ಹೆಚ್ಚಿನ ಸುರಕ್ಷತೆಗಾಗಿ, ಬ್ಯಾಕಪ್‌ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಸಾಧನವನ್ನು ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಫೋನ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ಹೊಂದಾಣಿಕೆಯ ಪ್ರಖರತೆ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ಲಭ್ಯವಿರುವ ಬೆಳಕಿನ ಪ್ರಖರತೆಯ ಮಟ್ಟವನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡು"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ನೈಟ್ ಲೈಟ್"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"ನೈಟ್ ಲೈಟ್ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಕೆಂಪು ಬಣ್ಣಕ್ಕೆ ಟಿಂಟ್ ಮಾಡುತ್ತದೆ. ಇದರಿಂದಾಗಿ ಮಂದ ಬೆಳಕಿನಲ್ಲಿಯೂ ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೋಡಲು ಅಥವಾ ಓದಲು ಸುಲಭವಾಗುತ್ತದೆ ಮತ್ತು ಸುಲಭವಾಗಿ ನಿದ್ರಿಸಲು ನಿಮಗೆ ಸಹಾಯ ಮಾಡಬಹುದು."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"ಅವಧಿ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ಸ್ಥಿತಿ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"ನೈಟ್ ಲೈಟ್ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಕೆಂಪು ಬಣ್ಣಕ್ಕೆ ಟಿಂಟ್ ಮಾಡುತ್ತದೆ. ಇದರಿಂದಾಗಿ ಮಂದ ಬೆಳಕಿನಲ್ಲಿಯೂ ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೋಡಲು ಅಥವಾ ಓದಲು ಸುಲಭವಾಗುತ್ತದೆ ಮತ್ತು ಸುಲಭವಾಗಿ ನಿದ್ರಿಸಲು ನಿಮಗೆ ಸಹಾಯ ಮಾಡಬಹುದು."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ಎಂದಿಗೂ ಬೇಡ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ಕಸ್ಟಮ್ ವೇಳಾಪಟ್ಟಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6bc81d7..fff0123 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"이름"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"확인"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"삭제"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"시작"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"시작"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"계속"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"손가락을 살짝 움직여 지문의 다른 부분도 전부 추가하세요."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"태블릿 보호"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"기기 보호"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"휴대전화 보호"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"보안을 강화하려면 백업 화면 잠금 설정"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"지문은 강력한 패턴이나 PIN, 비밀번호보다 안전하지 못합니다. 보안을 강화하려면 백업 화면 잠금을 설정하세요."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 태블릿을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 기기를 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 스마트폰을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"밝기 자동 조절"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"빛의 양에 따라 밝기 수준 최적화"</string>
     <string name="night_display_title" msgid="2626451512200357686">"야간 조명"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"야간 조명은 화면에 빨간색 농담 효과를 줍니다. 그러면 어두운 불빛에서 화면이 더 잘 보이며 수면 방해 효과가 줄어듭니다."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"예약"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"상태"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"야간 조명은 밤이 되면 화면에 빨간색 농담 효과를 줍니다. 그러면 어두운 불빛에서 화면이 더 잘 보이며 수면 방해 효과가 줄어듭니다."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"자동으로 사용 설정"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"안함"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"맞춤 일정"</string>
@@ -2930,12 +2928,12 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"없음"</string>
     <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"이 앱의 사용량 액세스 기능을 사용 중지해도 관리자가 직장 프로필에서 앱의 데이터 사용량을 추적할 수 있습니다."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g>자 중 <xliff:g id="COUNT_0">%1$d</xliff:g>자 사용"</string>
-    <string name="draw_overlay_title" msgid="4003905926278954971">"다른 앱 위에 표시할 수 있는 앱"</string>
+    <string name="draw_overlay_title" msgid="4003905926278954971">"다른 앱 위에 그릴 수 있는 앱"</string>
     <string name="draw_overlay" msgid="9078696044299199938">"다른 앱 위에 그리기"</string>
     <string name="system_alert_window_settings" msgid="1757821151143694951">"다른 앱 위에 그리기"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"앱"</string>
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"다른 앱 위에 그리기"</string>
-    <string name="permit_draw_overlay" msgid="6606018549732046201">"다른 앱 위에 표시 허용"</string>
+    <string name="permit_draw_overlay" msgid="6606018549732046201">"다른 앱 위에 그리기 허용"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"위에 그리기 앱 권한"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"이 권한이 있으면 앱이 사용 중인 다른 앱 위에 표시할 수 있으며, 다른 애플리케이션에서의 인터페이스 사용을 방해하거나 다른 애플리케이션에 표시되는 콘텐츠를 변경할 수 있습니다."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"VR 가상 현실 리스너 스테레오 도우미 서비스"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index ff62bda..4105870 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -354,7 +354,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Аталышы"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Жарайт"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жок кылуу"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Баштадык"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Баштадык!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Манжаңызды сенсорго коюп, дирилдегенин сезгенден кийин көтөрүңүз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Кайталоо"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Манжа изиңиздин ар кайсы бөлүгүн кошуу үчүн манжаңызды кичинеден жылдырыңыз"</string>
@@ -424,7 +424,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Планшетиңизди коргоңуз"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Түзмөгүңүздү коргоңуз"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Телефонуңузду коргоңуз"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Кошумча коопсуздук үчүн көмөкчү экран кулпусун жөндөп коюңуз."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч, PIN код же сырсөз менен коргоо бир кыйла коопсуз. Кошумча коопсуздук үчүн, көмөкчү экран кулпусун жөндөп коюңуз."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул планшетти сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул түзмөктү сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул телефонду сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
@@ -905,9 +905,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ыңгайлаштырылуучу жарык"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Жарык деңгээлин учурдагы жарыкка ыңгайлаштыруу"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Түнкү жарык"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Түнкү жарыкта экран кызыл түскө боёлот. Ушуну менен күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Күн тартиби"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Абалы"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Түнкү жарыкта экран кызыл түскө боелот. Ушуну менен күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматтык түрдө күйгүзүү"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Эч качан"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ыңгайлаштырылган график"</string>
@@ -3021,7 +3019,7 @@
     <string name="condition_work_title" msgid="7293722361184366648">"Жумуш профили өчүрүлгөн"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Жумуш профилиңизге байланыштуу колдонмолор, фондо шайкештирүү сыяктуу функциялар өчүрүлгөн."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Түнкү жарык күйүк"</string>
-    <string name="condition_night_display_summary" msgid="6156601053674688864">"Экран кызыл түскө боелуп, күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
+    <string name="condition_night_display_summary" msgid="6156601053674688864">"Экран кызыл түскө боелду. Бул сизге уктап калууга жардам берет."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Сунуштар"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Алып салуу"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 7ee6712..6027e9d 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ຊື່"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ຕົກລົງ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"​ລຶບ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ເລີ່ມກັນເລີຍ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ຈົ່ງ​ເລີ່ມ​ຕົ້ນ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ວາງ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ລົງ​ເທິງ​ເຊັນ​ເຊີ ແລະ ຍົກ​ຂຶ້ນ​ຫຼັງ​ຈາກ​ທ່ານ​ຮູ້​ສຶກ​ມີ​ການ​ສັ່ນ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ເຮັດຕໍ່ໄປ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ຍ້າຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄປ​ເລັກ​ນ້ອຍ ເພື່ອ​ເພີ່ມ​ທຸກ​ສ່ວນ​ທີ່​ແຕກ​ຕ່າງ​ຂອງ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ປົກ​ປ້ອງ​ແທັບ​ເລັດ​ຂອງ​ທ່ານ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ປົກປ້ອງອຸປະກອນຂອງທ່ານ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ປົກ​ປ້ອງ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ເພື່ອຄວາມປອດໄພທີ່ເພີ່ມຂຶ້ນ, ໃຫ້ຕັ້ງໜ້າຈໍລັອກສຳຮອງໄວ້."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ລາຍນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພໜ້ອຍກວ່າຮູບແບບການປົດລັອກ, PIN ຫຼື ລະຫັດທີ່ຍາກ. ເພື່ອຄວາມປອດໄພທີ່ສູງຂຶ້ນ, ທ່ານຄວນຕັ້ງການລັອກໜ້າຈໍສຳຮອງ."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ປັບ​ຄວາມ​ແຈ້ງ​ອັດຕະໂນມັດ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ປັບແຕ່ງ​ລະດັບ​ຄວາມແຈ້ງ​ຂອງ​ໜ້າ​ຈໍ​ໃຫ້​ເໝາະ​ສົມ​ກັບ​ແສງໄຟ​ຈາກ​ພາຍ​ນອກ"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ແສງກາງຄືນ"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"ຄຸນສົມບັດ ແສງກາງຄືນ ຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີແດງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"ຕັ້ງເວລາ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ສະຖານະ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"ການສະແດງຜົນກາງຄືນຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີແດງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ເປີດໃຊ້ອັດຕະໂນມັດ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ບໍ່ໃຊ້"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ກຳນົດການແບບເລືອກເອງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4a3920f..d7e2051 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pavadinimas"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Gerai"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ištrinti"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Pradėkime."</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Pradėkime!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Uždėkite pirštą ant jutiklio ir pakelkite, kai pajusite vibravimą"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Tęskite"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Truputį pajudinkite pirštą, kad būtų pridėtos visos skirtingos piršto atspaudo dalys"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Apsaugok. planš. komp."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Apsaugokite įrenginį"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Apsaugokite savo telefoną"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Kad dar labiau apsaugotumėte įrenginį, nustatykite atsarginį ekrano užraktą."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Kontrolinis kodas gali būti mažiau saugus nei sudėtingas atrakinimo piešinys, PIN kodas ar slaptažodis. Kad paskyra būtų saugesnė, nustatykite atsarginį ekrano užraktą."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prisitaikantis šviesumas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizuoti šviesumo lygį pagal esamą šviesą"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nakties šviesa"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Nustačius „Nakties šviesą“, naktį rodomas raudono atspalvio ekranas. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Tvarkaraštis"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Būsena"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Nustačius Nakties šviesą, ekranas naktį rodomas raudona spalva. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Įjungti automatiškai"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Niekada"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Tinkintas tvarkaraštis"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 360bc34..7f26120 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -358,7 +358,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nosaukums"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Labi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Dzēst"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Sāciet!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Sāciet!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Novietojiet pirkstu uz sensora un paceliet to pēc tam, kad sajūtat vibrāciju"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Turpināšana"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Nedaudz pakustiniet pirkstu, lai pievienotu dažādas pirksta nospieduma daļas."</string>
@@ -428,7 +428,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Aizsargājiet planšetd."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Aizsargājiet ierīci"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Aizsargājiet tālruni"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Papildu drošībai iestatiet rezerves ekrāna bloķēšanu."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija, PIN kods vai parole. Papildu drošībai iestatiet rezerves bloķēšanas ekrānu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
@@ -915,9 +915,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptīvs spilgtums"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizēt spilgtuma līmeni atbilstoši pieejamajam apgaismojumam"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nakts režīms"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Nakts režīmā ekrāns tiek tonēts sarkans. Tonējums atvieglo skatīšanos uz ekrānu vai lasīšanu blāvā apgaismojumā un var palīdzēt iemigt."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ieplānot"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Statuss"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Nakts režīmā ekrāns tiek tonēts sarkans. Tonējums atvieglo skatīšanos uz ekrānu vai lasīšanu blāvā apgaismojumā un var palīdzēt iemigt."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ieslēgt automātiski"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nekad"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Pielāgots grafiks"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 8717b48..e970410 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Име"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Во ред"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Избриши"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Да почнеме"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Да почнеме!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ставете го прстот на сензорот и подигнете го откако ќе почувствувате вибрации"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Допрете повторно"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Мрдајте малку со прстот за да ги додадете сите различни делови од вашиот отпечаток"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Заштитете го таблетот"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Заштитете го уредот"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Заштитете го телефонот"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"За дополнителна безбедност, поставете резервно заклучување екран."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Вашиот отпечаток можеби е помалку безбеден од силна шема или PIN. За дополнителна безбедност, поставете резервен заклучен екран."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречете ги другите да го користат уредот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Приспособлива осветленост"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизирање ниво на осветленост за достапното светло"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ноќно светло"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Ноќното светло го обојува екранот во црвена боја. Тоа го олеснува гледањето во екранот или читањето при затемнето светло и може да ви помогне полесно да заспиете."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Распоред"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Навечер, ноќното светло го обојува екранот во црвена боја. Тоа го олеснува гледањето во екранот или читањето при затемнето светло и може да ви помогне полесно да заспиете."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Вклучи автоматски"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никогаш"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Приспособен распоред"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 1be9e92..b3f601e 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"പേര്"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ശരി"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ഇല്ലാതാക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ആരംഭിക്കാം"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ആരംഭിക്കാം!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"സെൻസറിൽ വിരൽ വച്ച് ഒരു വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"അങ്ങനെത്തന്നെ തുടരുക"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"നിങ്ങളുടെ വിരലടയാളത്തിന്റെ എല്ലാ വ്യത്യസ്ത ഭാഗങ്ങളും ചേർക്കുന്നതിന് വിരൽ പതുക്കെ നീക്കുക"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ടാബ്‌ലെറ്റ് പരിരക്ഷിക്കുക"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ഉപകരണം പരിരക്ഷിക്കുക"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ഫോൺ പരിരക്ഷിക്കുക"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"അധിക സുരക്ഷയ്ക്ക്, ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ശക്തമായ പാറ്റേൺ, പിൻ അല്ലെങ്കിൽ പാസ്‌വേഡ് എന്നിവയെ അപേക്ഷിച്ച് ഫിംഗർപ്രിന്റിന്റെ സുരക്ഷിതത്വം കുറവായിരിക്കാം. വർദ്ധിത സുരക്ഷയ്ക്ക്, ഒരു ബാക്കപ്പ് ലോക്ക് സ്ക്രീൻ സജ്ജമാക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഉപകരണം ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഫോൺ ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"അനുയോജ്യമായ തെളിച്ചം"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ലഭ്യമായ പ്രകാശത്തിനായി തെളിച്ചനില അനുരൂപമാക്കുക"</string>
     <string name="night_display_title" msgid="2626451512200357686">"നൈറ്റ് ലൈറ്റ്"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"നിങ്ങളുടെ സ്ക്രീനിന് \'നൈറ്റ് ലൈറ്റ്\' ചുവപ്പ് നിറം നൽകുന്നു. മങ്ങിയ വെളിച്ചത്തിൽ സ്ക്രീനിൽ നോക്കുന്നത് ഈ ഡിസ്പ്ലേ സുഗമമാക്കുന്നു, എളുപ്പത്തിൽ ഉറങ്ങുന്നതിന് ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"സമയക്രമം"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"നില"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"രാത്രിയിൽ നിങ്ങളുടെ സ്ക്രീനിന് \'നൈറ്റ് ലൈറ്റ്\' ചുവപ്പ് നിറം നൽകുന്നു. മങ്ങിയ വെളിച്ചത്തിൽ സ്ക്രീനിൽ നോക്കുന്നത് ഈ ഡിസ്പ്ലേ സുഗമമാക്കുന്നു, എളുപ്പത്തിൽ ഉറങ്ങുന്നതിന് ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"സ്വയമേവ ഓണാക്കുക"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ഒരിക്കലും വേണ്ട"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ഷെഡ്യൂൾ ഇഷ്‌ടാനുസൃതമാക്കുക"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index b9b0213..123ecfd 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Нэр"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ТИЙМ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Устгах"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Эхэлцгээе"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Эхэлцгээе!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Мэдрэгч дээр хуруугаа тавиад, чичиргээ мэдрэгдэхэд аваарай"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Үргэлжлүүлээд байгаарай"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Хурууны хээгээ бүрэн гаргахын тулд хуруугаа удаанаар хөдөлгөнө үү."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Таблетаа хамгаалах"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Төхөөрөмжөө хамгаалах"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Утсаа хамгаалах"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Хамгаалалтыг сайжруулахын тулд дэлгэцийн нөөц түгжээг тохируулна уу."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Хурууны хээ нь зураасан түгжээ, ПИН, нууц үгнээс муу хамгаалалттай байдаг. Хамгаалалтыг сайжруулахад дэлгэцийн нөөц түгжээг тохируулах."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ таблетийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ төхөөрөмжийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ утсыг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Зохицогч гэрэлтүүлэг"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Боломжит гэрэлд тохируулан гэрэлтүүлгийг зохицуулах"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Шөнийн гэрэл"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Шөнийн гэрэл нь таны дэлгэцийг шөнийн цагт улаан туяатай болгодог. Ингэснээр та дэлгэцээ бүдэг гэрэлтэй үед илүү хялбар харж, танд хурдан унтахад тусална."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Хуваарь"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Төлөв"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Шөнийн гэрэл нь таны дэлгэцийг шөнийн цагт улаан өнгөтэй болгодог. Ингэснээр та дэлгэцээ бүдэг гэрэлтэй үед илүү хялбар харж, танд хурдан унтахад тусална."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматаар асаах"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Хэзээ ч үгүй"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Хуваарийг өөрчлөх"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index a967cdf..e1cf174 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाव"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक आहे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटवा"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"आपण प्रारंभ करूया"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"आपण प्रारंभ करूया!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"आपले बोट सेन्सरवर ठेवा आणि आपल्‍याला कंपन जाणवल्यावर ते उचला"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"सुरु ठेवावे"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"आपल्‍या फिंगरप्रिंटचे सर्व भिन्न प्रकार जोडण्‍यासाठी आपले बोट किंचित हलवा"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"आपला टॅबलेट संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"आपले डिव्हाइस संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"आपला फोन संरक्षित करा"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"आपले फिंगरप्रिंट मजबूत नमुना, पिन किंवा संकेतशब्दापेक्षा कमी सुरक्षित असू शकतात. अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा टॅबलेट वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"अनुकूलित चकाकी"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"उपलब्ध प्रकाशासाठी चकाकी स्तर ऑप्टिमाइझ करा"</string>
     <string name="night_display_title" msgid="2626451512200357686">"रात्रीचा प्रकाश"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"रात्रीचा प्रकाश आपल्या स्क्रीनला लाल रंगछटा देतो. हे मंद प्रकाशात आपली स्क्रीन पाहणे किंवा वाचणे सोपे करते आणि आपल्याला झोप येण्यात मदत करू शकते."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"अनुसूची"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"स्थिती"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"रात्रीचा प्रकाश आपल्या स्क्रीनला रात्री लाल रंगछटा देते. हे मंद प्रकाशात आपली स्क्रीन पाहणे सोपे करते आणि आपल्याला झोप येण्यात मदत करू शकते."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"स्वयंचलितपणे चालू करा"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"कधीही नाही"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"सानुकूल वेळापत्रक"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 0dfb003..6a0cf6a 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Padam"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Mari mulakan"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Mari mulakan!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Letakkan jari anda pada penderia, kemudian angkat jari itu selepas anda merasa getaran"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Gerakkan jari anda sedikit untuk menambahkan bahagian lain cap jari anda"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Lindungi tablet anda"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Lindungi peranti anda"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Lindungi telefon anda"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Untuk keselamatan tambahan, sediakan kunci skrin sandaran."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Cap jari anda mungkin kurang selamat berbanding corak, PIN atau kata laluan yang kukuh. Untuk keselamatan tambahan, sediakan kunci skrin sandaran."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Halang orang lain daripada menggunakan tablet ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan mudah suai"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimumkan tahap kecerahan untuk cahaya yang tersedia"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Cahaya Malam"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Paparan Malam memberi seri warna merah pada skrin anda. Ini memudahkan lagi anda melihat skrin atau membaca dalam cahaya malap dan mungkin dapat membantu anda tidur dengan lebih mudah."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Jadual"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Paparan Malam memberi seri warna merah pada skrin anda pada waktu malam. Perkara ini memudahkan lagi anda melihat skrin atau membaca dalam cahaya malap dan mungkin dapat membantu anda tidur dengan lebih mudah."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Hidupkan secara automatik"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jangan sekali-kali"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Jadual tersuai"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index a122d48..73c4788 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"အမည်"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"အိုကေ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ဖျက်ရန်"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"စတင်ကြစို့"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"စတင်ကြစို့။"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာ ပေါ်သို့ တင်ပေးလိုက်ကာ တုန်ခါမှုကို ခံစားရချိန်တွင် မ’ယူလိုက်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ဆက်လုပ်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"သင့်လက်ဗွေရဲ့  အပိုင်း အမျိုးမျိုးကို ထည့်ပေးရန် သင့်လက်ချောင်းကို မသိမသာ ရွေ့လျားပေးပါ"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"သင့်တက်ဘလက်ကို ကာကွယ်ပါ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"သင့်စက်ပစ္စည်းကို ကာကွယ်ပါ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"သင့်ဖုန်းကို ကာကွယ်ပါ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"လုံခြုံရေး ပိုမိုကောင်းမွန်စေရန် မျက်နှာပြင်လော့ခ်ချခြင်း အရန်နည်းလမ်းတစ်ခုကို သတ်မှတ်ပါ။"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"သင့်လက်ဗွေသည် လုံခြုံသည့် ပုံစံ၊ ပင်နံပါတ် သို့မဟုတ် စကားဝှက်ထက် ပိုအားနည်းပါသည်။ ထည့်သွင်းထားသည့် စကားဝှက်အတွက် ဖန်သားပြင်လော့ခ်ချခြင်း အရန်စနစ်တစ်ခုကို ထည့်သွင်းပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤတက်ဘလက်ကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤစက်ပစ္စည်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤဖုန်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"အလိုက်သင့် တောက်ပမှု"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"လက်ရှိအလင်းရောင်ပေါ် မှုတည်ပြီး တောက်ပမှုအများဆုံးရယူမည်"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ညအလင်းရောင်"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"ညအလင်းရောင်သည် ညအခါတွင် သင့်ဖန်သားပြင် သို့မဟုတ် စာဖတ်မျက်နှာပြင်ကို အနီရောင်သန်းစေပါသည်။ ထိုသို့ပြုလုပ်ခြင်းအားဖြင့် အရောင်မှိန်သည့်မီးရောင်အောက်တွင် သင့်ဖန်သားပြင်ကို ကြည့်ရှုရပိုမိုအဆင်ပြေစေပြီး လွယ်လွယ်ကူကူ အိပ်ပျော်သွားစေရန် အကူအညီ ပေးကောင်းပေးနိုင်ပါလိမ့်မည်။"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"အချိန်ဇယား"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"အခြေအနေ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"ညအလင်းရောင်သည် ညအခါတွင် သင့်ဖန်သားပြင် သို့မဟုတ် စာဖတ်မျက်နှာပြင်ကို အနီရောင်သန်းစေပါသည်။ ထိုသို့ပြုလုပ်ခြင်းအားဖြင့် အရောင်မှိန်သည့်မီးရောင်အောက်တွင် သင့်ဖန်သားပြင်ကို ကြည့်ရှုရပိုမိုအဆင်ပြေစေပြီး လွယ်လွယ်ကူကူ အိပ်ပျော်သွားစေရန် အကူအညီ ပေးကောင်းပေးနိုင်ပါလိမ့်မည်။"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"အလိုအလျောက် ဖွင့်ပါ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ဘယ်တော့မှ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"မိမိစိတ်ကြိုက် အစီအစဉ်ချခြင်း"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index af47634..55bc051 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slett"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Kom i gang"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"La oss sette i gang!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plassér fingeren på sensoren, og løft den når du kjenner en vibrasjon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fortsett"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Flytt fingeren litt for å registrere de ulike delene av fingeravtrykket ditt"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Beskytt nettbrettet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Beskytt enheten"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Beskytt telefonen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurer en lås for bakgrunnskjermen din for å få ekstra beskyttelse."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fingeravtrykk kan være mindre sikkert enn sterke mønstre, PIN-koder eller passord. Bruk en ekstra låseskjerm for ekstra sikkerhet."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Lysstyrken tilpasser seg"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliser lysstyrkenivået etter omgivelsene"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nattlys"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Nattlys gir skjermen en rød nyanse. Dette gjør det mer komfortabelt å se på skjermen eller lese ved svakt lys, og det kan gjøre det enklere å sovne."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planlegg"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Nattlys gir skjermen en rød nyanse om natten. Dette gjør det mer komfortabelt å se på skjermen eller lese ved svakt lys, og det kan gjøre det enklere å sovne."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Slå på automatisk"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldri"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Tilpasset tidsplan"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index dfd79a1..b723d17 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक छ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"मेटाउनुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"सुरु गरौँ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"सुरु गरौं!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"सेन्सरमा आफ्नो औंला राख्नुहोस्  र तपाईंले भाइब्रेसन महसुस गरेपछि उठाउनुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"छोइराख्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"तपाईंको फिंगरप्रिन्टको सबै फरक भागहरु थप्न आफ्नो औंला बिस्तारै सार्नुहोस्"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"आफ्नो ट्याब्लेटलाई सुरक्षित गर्नुहोस्"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"आफ्नो यन्त्रलाई सुरक्षित गर्नुहोस्"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"तपाईँको फोन सुरक्षित गर्नुहोस्"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"थप सुरक्षाका लागि एउटा ब्याक अप सम्बन्धी स्क्रिन लक सेट अप गर्नुहोस्।"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"तपाईँको फिंगरप्रिन्ट बलियो ढाँचा, PIN वा पासवर्ड भन्दा कम सुरक्षित हुन सक्छ। थप सुरक्षाका लागि ब्याकअप स्क्रिन लकलाई सेट अप गर्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो ट्याब्लेट प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो यन्त्र प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो फोन प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"अनुकूलीत चमक"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"उपलब्ध प्रकाशका लागि चमक तह प्रभावकारी बनाउँछ"</string>
     <string name="night_display_title" msgid="2626451512200357686">"रात्रिको प्रकाश"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"रात्रिको प्रकाशले तपाईँको यन्त्रको स्क्रिनलाई हल्का रातो रङको बनाउँछ। यसले मधुरो प्रकाशमा यन्त्रको स्क्रिन हेर्न र पढ्न सजिलो बनाउँछ र तपाईँलाई अझ सजिलैसँग निदाउन मद्दत गर्न सक्छ।"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"समय निर्धारण गर्नुहोस्"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"वस्तुस्थिति"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"रात्रिको प्रकाशले रातको बेला तपाईँको यन्त्रको स्क्रिनलाई हल्का रातो रङको बनाउँछ। यसले मधुरो प्रकाशमा यन्त्रको स्क्रिन हेर्न र पढ्न सजिलो बनाउँछ र तपाईँलाई अझ सजिलैसँग निदाउन मद्दत गर्न सक्छ।"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"स्वतः सक्रिय पार्नुहोस्"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"कहिले पनि होइन"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"अनुकूलन समय सहितको कार्यतालिका"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4d5b5eb..3bef88e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Verwijderen"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Aan de slag"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Aan de slag"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Blijf aanraken"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg je vinger enigszins om alle delen van je vingerafdruk toe te voegen"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Je tablet beschermen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Je apparaat beschermen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bescherm je telefoon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Stel een extra schermvergrendeling in voor betere beveiliging."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Je vingerafdruk is mogelijk minder veilig dan een sterk patroon, sterke pincode of sterk wachtwoord. Stel een extra schermvergrendeling in voor betere beveiliging."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Helderheidsniveau optimaliseren voor het beschikbare licht"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nachtverlichting"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Met Nachtverlichting krijgt je scherm een rode tint. Zo kun je het scherm beter zien bij weinig licht en val je gemakkelijker in slaap."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planning"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Met Nachtverlichting krijgt je scherm \'s nachts een rode tint. Zo kun je het scherm beter zien bij weinig licht en val je gemakkelijker in slaap."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatisch inschakelen"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nooit"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Aangepaste planning"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index c3b7fa3..4922903 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ਨਾਮ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ਠੀਕ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ਮਿਟਾਓ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ਚੱਲੋ ਸ਼ੁਰੂ ਕਰੀਏ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ਆਓ ਸ਼ੁਰੂ ਕਰੀਏ!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੰਵੇਦਕ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਕੰਪਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਸਾਰੇ ਵੱਖ-ਵੱਖ ਹਿੱਸੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਥੋੜ੍ਹਾ ਜਿਹਾ ਸਰਕਾਓ"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ਆਪਣੀ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ਆਪਣੇ ਫੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ।"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ, PIN, ਜਾਂ ਪਾਸਵਰਡ ਤੋਂ ਘੱਟ ਸੁੱਰਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ। ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ਅਨੁਕੂਲਨਹਾਰ ਚਮਕ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ਉਪਲਬਧ ਰੋੋਸ਼ਨੀ ਲਈ ਚਮਕ ਦਾ ਪੱਧਰ ਸੁਯੋਗ ਬਣਾਓ"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ਰਾਤਰੀ ਲਾਈਟ"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"ਰਾਤਰੀ ਲਾਈਟ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਲਾਲ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੋਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"ਸਮਾਂ-ਸੂਚੀ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ਸਥਿਤੀ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"ਰਾਤਰੀ ਲਾਈਟ ਰਾਤ ਨੂੰ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਲਾਲ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੋਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਾਰਜ-ਕ੍ਰਮ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 76d0886..b6766a0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nazwa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Usuń"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Zaczynamy"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Rozpocznij"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nie przerywaj"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Obróć lekko palcem, by odcisk był bardziej dokładny."</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Chroń swój tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Chroń swoje urządzenie"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zabezpiecz telefon"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ze względów bezpieczeństwa skonfiguruj zapasową blokadę ekranu."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Odcisk palca może być mniej bezpieczny niż skomplikowany wzór, kod PIN lub hasło. Dla większego bezpieczeństwa ustaw dodatkową blokadę ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Automatyczna jasność"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Dostosuj poziom jasności do oświetlenia"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Podświetlenie nocne"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Gdy Podświetlenie nocne jest włączone, kolory na ekranie stają się cieplejsze. Taki odcień mniej męczy oczy przy słabym oświetleniu i ułatwia zaśnięcie."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Harmonogram"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stan"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Gdy Podświetlenie nocne jest włączone, kolory na ekranie stają się cieplejsze. Taki odcień mniej męczy oczy przy słabym oświetleniu i ułatwia zaśnięcie."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Włącz automatycznie"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nigdy"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Własny harmonogram"</string>
@@ -1693,7 +1691,7 @@
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Czytnik ekranu przeznaczony głównie dla osób niewidomych i słabowidzących"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_display_title" msgid="7610175687949675162">"Wyświetlacz"</string>
+    <string name="accessibility_display_title" msgid="7610175687949675162">"Ekran"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisy"</string>
     <string name="accessibility_screen_magnification_title" msgid="9002237235486714636">"Gest powiększenia"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Kliknij trzy razy, by powiększyć"</string>
@@ -3094,7 +3092,7 @@
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
     <string name="cellular_data_usage" msgid="2763710678354680712">"Komórkowa transmisja danych"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Transmisja danych przez Wi-Fi"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Transmisja danych w sieci Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Transmisja danych w sieci Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 2fc67f4..0b5b5bb 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Vamos começar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Vamos começar!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mova o dedo levemente para adicionar todas as partes da sua impressão digital"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"A impressão digital pode ser menos segura que um padrão, PIN ou senha fortes. Para aumentar a segurança, configure uma tela de bloqueio alternativa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar nível de brilho de acordo com a luz disponível"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Modo noturno"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"O modo noturno tinge sua tela de vermelho. Isso facilita olhar para a tela ou ler com pouca luz e pode ajudar você a adormecer com mais facilidade."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"O modo noturno tinge sua tela de vermelho à noite. Isso facilita olhar para a tela ou ler com pouca luz e pode ajudar você a adormecer com mais facilidade."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ativar automaticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programação personalizada"</string>
@@ -3075,7 +3073,7 @@
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nunca ativar automaticamente"</string>
-    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s de bateria"</string>
+    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s%% de bateria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Otimização de bateria desativada"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Se o dispositivo estiver bloqueado, impedir a digitação de respostas ou outros textos nas notificações"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Corretor ortográfico padrão"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 03c122c..528330a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Vamos começar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Vamos começar!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque o dedo sobre o sensor e levante-o depois de sentir uma vibração"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Desloque o dedo ligeiramente para adicionar as diferentes partes da sua impressão digital"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o seu tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o telemóvel"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para maior segurança, configure um bloqueio de ecrã de segurança."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"A sua impressão digital pode ser menos segura do que um padrão, um PIN ou uma palavra-passe fortes. Configure um ecrã de bloqueio de ecrã de segurança como medida de proteção adicional."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impeça terceiros de utilizar este tablet sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosidade adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar o nível de luminosidade de acordo com a luz disponível"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz noturna"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"A Luz noturna aplica uma tonalidade vermelha ao ecrã. Assim, é mais fácil olhar para o ecrã ou ler com pouca luz e pode ajudar a adormecer mais facilmente."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programação"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"A Luz noturna aplica uma tonalidade vermelha ao ecrã à noite. Assim, é mais fácil olhar para o ecrã ou ler com pouca luz e pode ajudar a adormecer mais facilmente."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ativar automaticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programação personalizada"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2fc67f4..0b5b5bb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Vamos começar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Vamos começar!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mova o dedo levemente para adicionar todas as partes da sua impressão digital"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteger o tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteger o dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteger o smartphone"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para aumentar a segurança, configure um bloqueio de tela alternativo."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"A impressão digital pode ser menos segura que um padrão, PIN ou senha fortes. Para aumentar a segurança, configure uma tela de bloqueio alternativa."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar nível de brilho de acordo com a luz disponível"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Modo noturno"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"O modo noturno tinge sua tela de vermelho. Isso facilita olhar para a tela ou ler com pouca luz e pode ajudar você a adormecer com mais facilidade."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"O modo noturno tinge sua tela de vermelho à noite. Isso facilita olhar para a tela ou ler com pouca luz e pode ajudar você a adormecer com mais facilidade."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ativar automaticamente"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programação personalizada"</string>
@@ -3075,7 +3073,7 @@
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nunca ativar automaticamente"</string>
-    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s de bateria"</string>
+    <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s%% de bateria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Otimização de bateria desativada"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Se o dispositivo estiver bloqueado, impedir a digitação de respostas ou outros textos nas notificações"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Corretor ortográfico padrão"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 25d9baa..ba35d47 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -358,7 +358,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Denumiți"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ștergeți"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Să începem"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Să începem!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Puneți degetul pe senzor și ridicați-l după ce simțiți o vibrație"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Atingeți în continuare"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mișcați ușor degetul pentru a adăuga toate porțiunile amprentei"</string>
@@ -428,7 +428,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protejați tableta"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protejați dispozitivul"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protejați telefonul"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Pentru mai multă siguranță, configurați o blocare a ecranului de rezervă."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Este posibil ca amprenta să fie mai puțin sigură decât un model, un cod PIN sau o parolă puternică. Setați o blocare a ecranului de rezervă, pentru mai multă siguranță."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
@@ -915,9 +915,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminozitate adaptivă"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizează nivelul de luminozitate pentru lumina disponibilă"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Lumină de noapte"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Lumina de noapte dă o nuanță de roșu ecranului. Astfel, este mai ușor să priviți ecranul sau să citiți într-o lumină slabă și vă poate ajuta să adormiți mai rapid."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Program"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stare"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Lumina de noapte dă o nuanță de roșu ecranului pe timpul nopții. Astfel, este mai ușor să priviți ecranul într-o lumină slabă și vă poate ajuta să adormiți mai rapid."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activați automat"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Niciodată"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programare personalizată"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c4704fd..0205253 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Название"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Удалить"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Начало работы"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Начнем!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Нажмите ещё раз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Немного перемещайте палец, чтобы получить полный отпечаток."</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Защитите планшет"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Защитите устройство"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Защитите телефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Чтобы повысить безопасность, настройте дополнительный способ блокировки экрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Распознавание отпечатков пальцев обеспечивает менее надежную защиту, чем графический ключ, PIN-код или пароль. Настройте дополнительную блокировку экрана."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивная регулировка"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Менять яркость с учетом уровня освещенности"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ночной режим"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"В ночном режиме экран приобретает красноватый оттенок. Это снижает напряжение глаз при тусклом свете и может помочь вам быстрее заснуть."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Расписание"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"В ночном режиме экран приобретает красноватый оттенок. Это снижает напряжение глаз при тусклом свете и может помочь вам быстрее заснуть."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Включать автоматически"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Всегда выключать"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Мое расписание"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index fd74dfb..90f48e0 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"නම‍"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"හරි"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"මකන්න"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"අපි පටන් ගනිමු"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"පටන් ගනිමු!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ඔබගේ ඇඟිල්ල සංවේදකය මත තබා කම්පනයක් දැනෙන විට ඔසවන්න"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"දිගටම කර ගෙන යන්න"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ඔබගේ ඇඟිලි සලකුණේ වෙනස් කොටස් සියල්ල එක් කිරීම සඳහා ඔබගේ ඇඟිල්ල යන්තමින් වෙනස් කරන්න"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ඔබගේ ටැබ්ලටය ආරක්ෂා කර ගන්න"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ඔබගේ උපාංගය ආරක්ෂා කර ගන්න"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ඔබගේ දුරකථනය ආරක්ෂා කර ගන්න"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"අමතර ආරක්ෂාව සඳහා, උපස්ථ තිර අගුලක් සකසන්න."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට, PIN අංකයකට හෝ මුරපදයකට වඩා ආරක්ෂිත බවෙන් අඩුය. වැඩි ආරක්ෂාව සඳහා උපස්ථ අගුලු තිරයක් පිහිටුවන්න."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම ටැබ්ලට උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම දුරකථනය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"අනුවර්තක දීප්තිය"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"පවතින ආලෝකය සඳහා දීප්තිමත් මට්ටම"</string>
     <string name="night_display_title" msgid="2626451512200357686">"රාත්‍රී ආලෝකය"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"රාත්‍රී ආලෝකය රාත්‍රියට ඔබේ තිරය රතු වර්ණ ගන්වයි. මෙය අඳුරු ආලෝකයේදී ඔබේ තිරය දෙස බැලීම වඩා පහසු කරන අතර ඔබට වඩාත් පහසුවෙන් නිදා ගැනීමට උදවු කළ හැකිය."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"කාල සටහන"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"තත්ත්වය"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"රාත්‍රී ආලෝකය රාත්‍රියට ඔබේ තිරය රතු වර්ණ ගන්වයි. මෙය අඳුරු ආලෝකයේදී ඔබේ තිරය දෙස බැලීම වඩා පහසු කරන අතර ඔබට වඩාත් පහසුවෙන් නිදා ගැනීමට උදවු කළ හැකිය."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ස්වයංක්‍රියව ක්‍රියාත්මක කරන්න"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"කිසිවිටෙකත් නොවේ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"අභිරුචි කාල සටහන"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index dc668fc..b028999 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Meno"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Odstrániť"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Začíname"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Začíname!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Priložte prst k senzoru a zdvihnite ho, keď zacítite vibráciu."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Pokračujte"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Pohýbte zľahka prstom, aby ste pridali všetky odlišné časti vášho odtlačku"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Chráňte svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Chráňte svoje zariadenie"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Chráňte svoje telefón"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Zaistite si ďalšiu úroveň zabezpečenia – nastavte si záložnú zámku obrazovky."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Odtlačok prsta môže byť menej bezpečný ako silný vzor, PIN alebo heslo. Nastavte si dodatočnú zámku obrazovky a získajte tak vyššiu bezpečnosť."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prispôsobovať jas"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovať jas podľa okolitého svetla"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nočný režim"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Nočný režim zafarbí obrazovku do červena. Obrazovka bude pri tlmenom osvetlení menej rušivá aj čitateľnejšia a bude sa vám lepšie zaspávať."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Rozvrh"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stav"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Nočný režim zafarbí obrazovku v noci do červena. Obrazovka bude pri tlmenom osvetlení menej rušivá aj čitateľnejšia a bude sa vám lepšie zaspávať."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Zapínať automaticky"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikdy"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Vlastný rozvrh"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 061659d..b3e391a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ime"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"V redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Začnimo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Začnimo."</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Položite prst na tipalo in ga dvignite, ko začutite vibriranje"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Kar tako naprej"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Rahlo premaknite prst, da dodate vse različne dele prstnega odtisa"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaščita tablič. račun."</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaščita naprave"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Zaščita telefona"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Prstni odtis bo morda manj varen kot zapleten vzorec, koda PIN ali geslo. Zaradi večje varnosti nastavite nadomestno zaklepanje zaslona."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svetlost"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje ravni svetlosti glede na razpoložljivo svetlobo"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nočna svetloba"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Nočna svetloba zaslon obarva z rdečim odtenkom. To olajša gledanje na zaslon ali branje v šibki svetlobi in vam lahko pomaga prej zaspati."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Razpored"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stanje"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Nočna svetloba zaslon obarva z rdečim odtenkom. To olajša gledanje na zaslon ali branje v šibki svetlobi in vam lahko pomaga prej zaspati."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Samodejni vklop"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikoli"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Razpored po meri"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index e479abd..da29279 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Emri"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Në rregull"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Fshi"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Fillojmë"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Fillojmë!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Vendose gishtin mbi sensor dhe ngrije pasi të ndjesh një dridhje"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lëvize pak gishtin për të shtuar të gjitha pjesët e ndryshme të gishtit tënd"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Mbroje tabletin tënd"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Mbroje pajisjen tënde"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Mbroje telefonin tënd"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Për më shumë siguri, konfiguro një kyçje rezervë për ekranin."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv, një kod PIN ose një fjalëkalim i fortë. Për më shumë siguri, konfiguro një kyçje rezervë të ekranit."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Parandalo që të tjerët ta përdorin këtë tablet pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ndriçimi i përshtatshëm"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizo nivelin e ndriçimit sipas ambientit"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Drita e natës"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Drita e natës e ngjyros ekranin në të kuqe. Kjo e bën më të lehtë shikimin e ekranit në dritë të zbehtë dhe mund të të ndihmojë të flesh gjumë më lehtë."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Orari"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Statusi"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Drita e natës e ngjyros ekranin në të kuqe gjatë natës. Kjo e bën më të lehtë shikimin e ekranit në dritë të zbehtë dhe mund të të ndihmojë të flesh gjumë më lehtë."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktivizo automatikisht"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Asnjëherë"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Personalizo programin"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 25b4049..1fe7c7d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -358,7 +358,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Назив"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Потврди"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Избриши"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Започнимо"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Да почнемо!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ставите прст на сензор и подигните га када осетите вибрацију"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Наставите даље"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Мало померите прст да бисте додали различите делове отиска прста"</string>
@@ -428,7 +428,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Заштитите таблет"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Заштитите уређај"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Заштитите телефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ради веће безбедности подесите резервни метод за закључавање екрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Отисак прста може да буде мање безбедан од јаког шаблона, PIN-а или лозинке. Подесите резервни метод за закључавање екрана ради додатне безбедности."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Спречите друге да користе овај таблет без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречите друге да користе овај уређај без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречите друге да користе овај телефон без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
@@ -915,9 +915,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Прилагодљива осветљеност"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизује ниво осветљености према доступном светлу"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ноћно светло"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Ноћно светло даје екрану црвену нијансу. То вам омогућава да лакше прегледате садржај екрана при пригушеном светлу и да лакше заспите."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Закажите"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Ноћно светло даје екрану црвену нијансу ноћу. То вам омогућава да лакше прегледате садржај екрана при пригушеном светлу и да лакше заспите."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Аутоматски укључи"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никад"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Прилагођени распоред"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 74be9fd..415ff6a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Namn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Radera"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Sätt igång"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Sätt igång!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Lägg fingret på sensorn och ta bort det när den vibrerar till"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fortsätt"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Rör lite på fingret så att hela fingeravtrycket läggs till"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Skydda surfplattan"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Skydda enheten"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Skydda mobilen"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Konfigurera ett skärmlås för ytterligare skydd."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Fingeravtryck kan vara mindre säkra än ett starkt grafiskt lösenord, en pinkod eller ett lösenord. Konfigurera en låsskärm som reservlösning för säkerhets skull."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Hindra andra från att använda surfplattan utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Anpassad ljusstyrka"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimera ljusstyrkan efter det tillgängliga ljuset"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nattljus"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Med nattljus blir skärmen rödtonad. Då ser du bättre i dunkelt ljus och det kan bli lite lättare att somna."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schemalägga"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Med nattljus blir skärmen rödtonad på natten. Då ser du bättre i dunkelt ljus och det kan bli lite lättare att somna."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktivera automatiskt"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldrig"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Anpassat schema"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2eda472..e75a465 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -357,7 +357,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jina"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"SAWA"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Futa"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Tuanze"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Acha tuanze!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Weka kidole chako juu ya kihisi kisha ukiinue baada ya kuhisi mtetemo"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Sogeza kidole chako taratibu ili uongeze sehemu zote za alama za kidole chako"</string>
@@ -427,7 +427,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Linda kompyuta yako kibao"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Linda kifaa chako"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Linda simu yako"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Weka mbinu mbadala ya kufunga skrini ili uimarishe usalama."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Huenda alama ya kidole ikawa na kiwango cha chini cha usalama ikilinganishwa na mchoro, PIN thabiti au nenosiri. Ili kuimarisha usalama, weka mbinu mbadala ya kufunga skrini."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
@@ -910,9 +910,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Mwangaza unaojirekebisha"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Boresha kiwango cha ung\'avu cha mwanga unaopatikana"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Mwanga wa Usiku"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa nyekundu. Hali hii inafanya iwe rahisi kuangalia skrini yako katika mwangaza hafifu na huenda ikakusaidia kulala kwa urahisi."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ratiba"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Hali"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa nyekundu wakati wa usiku. Hali hii inafanya iwe rahisi kuangalia skrini yako katika mwangaza hafifu na huenda ikakusaidia kulala kwa urahisi."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Washa kiotomatiki"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Usiwahi"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ratiba maalum"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 10b0b62..3651d37 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"பெயர்"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"சரி"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"நீக்கு"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"தொடங்குவோம்"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"தொடங்கலாம்!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"விரலை உணர்வியில் வைத்து, அதிர்வை உணர்ந்த பின்னர் விரலை எடுக்கவும்"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"கைரேகையின் வெவ்வேறு பகுதிகளைச் சேர்க்க, விரலை சற்று நகர்த்தவும்"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"டேப்லெட்டைப் பாதுகாக்கவும்"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"சாதனத்தைப் பாதுகாக்கவும்"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ஃபோனைப் பாதுகாக்கவும்"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"கூடுதல் பாதுகாப்பிற்கு, மாற்றுத் திரைப் பூட்டை அமைக்கவும்."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"உங்கள் கைரேகையானது வலுவான பேட்டர்ன், பின் அல்லது கடவுச்சொல்லை விட குறைந்த பாதுகாப்புடையதாக இருக்கக்கூடும். கூடுதல் பாதுகாப்பிற்கு, மாற்றுத் திரைப் பூட்டை அமைக்கவும்."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்த டேப்லெட்டைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் உங்கள் ஃபோனைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ஒளிர்வைத் தானாகச் சரிசெய்தல்"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"கிடைக்கும் ஒளிக்கேற்ப ஒளிர்வை சரிசெய்"</string>
     <string name="night_display_title" msgid="2626451512200357686">"இரவு ஒளி"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"இரவு ஒளி அம்சமானது உங்கள் திரையைச் சிவப்புச் சாயலுக்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"திட்ட அட்டவணை"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"நிலை"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"இரவு ஒளி அம்சமானது இரவில் உங்கள் திரையைச் சிவப்புச் சாயலுக்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"தானாகவே இயக்கு"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ஒருபோதும் வேண்டாம்"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"தனிப்பயன் திட்ட அட்டவணை"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 2c2a08b..1228805 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"పేరు"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"సరే"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"తొలగించు"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ప్రారంభించండి"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ప్రారంభిద్దాం!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"మీ వేలిని సెన్సార్‌పై ఉంచి, మీకు వైబ్రేషన్ అనుభూతి కలిగిన తర్వాత దాన్ని తీసివేయండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"కొనసాగించండి"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"మీ వేలిముద్రలోని వివిధ భాగాలన్నింటినీ జోడించడానికి మీ వేలిని కొద్దిగా అటూ ఇటూ జరపండి"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"మీ టాబ్లెట్ రక్షించుకోండి"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"మీ పరికరం రక్షించుకోండి"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"మీ ఫోన్‌ను రక్షించుకోండి"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"అదనపు భద్రత కోసం, ఒక బ్యాకప్ స్క్రీన్ లాక్‌ను సెటప్ చేసుకోండి."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"మీ వేలిముద్ర శక్తివంతమైన నమూనా, పిన్ లేదా పాస్‌వర్డ్ కంటే తక్కువ సురక్షితంగా ఉండవచ్చు. అదనపు భద్రత కోసం, బ్యాకప్ స్క్రీన్ లాక్‌ను సెటప్ చేయండి."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ టాబ్లెట్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"అనుకూల ప్రకాశం"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"అందుబాటులో ఉన్న కాంతికి ప్రకాశం స్థాయిని అనుకూలీకరించండి"</string>
     <string name="night_display_title" msgid="2626451512200357686">"రాత్రి కాంతి"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"రాత్రి కాంతి మీ స్క్రీన్‌ను లేత ఎరుపు రంగులో ఉండేలా మారుస్తుంది. దీని వలన తక్కువ కాంతి ఉన్నప్పుడు మీ స్క్రీన్‌ని చూడటం లేదా తక్కువ వెలుగులో చదవటం సులభం అవుతుంది, అలాగే మీరు మరింత సులభంగా నిద్రలోకి జారుకునేలా సహాయకరంగా ఉండవచ్చు."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"షెడ్యూల్"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"స్థితి"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"రాత్రి కాంతి మీ స్క్రీన్‌ను రాత్రిపూట లేత ఎరుపు రంగులో ఉండేలా మారుస్తుంది. దీని వలన తక్కువ కాంతి ఉన్నప్పుడు మీ స్క్రీన్‌ని చూడటం లేదా తక్కువ వెలుగులో చదవటం సులభం అవుతుంది, అలాగే మీరు మరింత సులభంగా నిద్రలోకి జారుకునేలా సహాయకరంగా ఉండవచ్చు."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ఎప్పుడూ వద్దు"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"అనుకూల షెడ్యూల్"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ccf5351..a5b4992 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ชื่อ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ตกลง"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ลบ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"มาเริ่มกันเลย"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"มาเริ่มกันเลย"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"วางนิ้วบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"แตะเซ็นเซอร์ซ้ำ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"เลื่อนนิ้วเล็กน้อยเพื่อเพิ่มส่วนต่างๆ ทั้งหมดของลายนิ้วมือ"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ปกป้องแท็บเล็ตของคุณ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ปกป้องอุปกรณ์ของคุณ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ปกป้องโทรศัพท์ของคุณ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"หากต้องการเพิ่มความปลอดภัย ให้ตั้งค่าการล็อกหน้าจอสำรอง"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบ, PIN หรือรหัสผ่านที่เดายาก โปรดตั้งค่าล็อกหน้าจอสำรองเพื่อให้ปลอดภัยยิ่งขึ้น"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"ปรับระดับความสว่างให้เหมาะกับแสงที่มีอยู่"</string>
     <string name="night_display_title" msgid="2626451512200357686">"แสงตอนกลางคืน"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"แสงตอนกลางคืนจะแต้มสีแดงบนหน้าจอ ซึ่งจะทำให้มองหรืออ่านหน้าจอในแสงสลัวได้ง่ายขึ้นและอาจช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"กำหนดการ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"สถานะ"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"แสงตอนกลางคืนจะแต้มสีแดงบนหน้าจอในเวลากลางคืน ซึ่งจะทำให้มองหรืออ่านหน้าจอในแสงสลัวได้ง่ายขึ้นและอาจช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"เปิดอัตโนมัติ"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ไม่ใช้"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"กำหนดการที่กำหนดเอง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index fa6c431..f7d2f29 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pangalan"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"I-delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Magsimula na tayo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Magsimula na tayo!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ilagay ang iyong daliri sa sensor at iangat pagkatapos mong makaramdam ng pag-vibrate"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Magpatuloy"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bahagyang ilipat ang iyong daliri upang idagdag ang lahat ng iba\'t ibang bahagi ng iyong fingerprint"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protektahan ang tablet mo"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protektahan ang device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Protektahan phone mo"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Para sa karagdagang seguridad, mag-set up ng backup na lock ng screen."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Maaaring hindi gaanong secure ang iyong fingerprint kumpara sa mahirap hulaang pattern, PIN o password. Para sa karagdagang seguridad, mag-set up ng backup na screen lock."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Pigilan ang ibang taong magamit ang tablet na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"I-optimize ang antas ng brightness para sa available na ilaw"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Dahil sa Night Light, nagiging kulay pula ang iyong screen sa gabi. Mas pinapadali nitong matingnan ang iyong screen o makapagbasa sa dim light at maaaring makatulong sa iyong mas mabilis na makatulog."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Iskedyul"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Dahil sa Night Light, nagiging kulay pula ang iyong screen sa gabi. Mas pinapadali nitong matingnan ang iyong screen o makapagbasa sa dim light at maaaring makatulong sa iyong mas mabilis na makatulog."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Awtomatikong i-on"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Hindi Kailanman"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Custom na iskedyul"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index df66e51..6b15562 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ad"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Tamam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Sil"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Başlayalım"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Başlayalım!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Parmağınızı sensörün üzerine koyun ve bir titreşim hissettiğinizde kaldırın"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Devam edin"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı çok az hareket ettirin."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Tabletinizi koruyun"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Cihazınızı koruyun"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefonunuzu koruyun"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Daha fazla güvenlik için yedek ekran kilidi ayarlayın."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Parmak iziniz güçlü bir desene, PIN\'e veya şifreye göre daha az güvenli olabilir. Daha fazla güvenlik için bir yedek ekran kilidi ayarlayın."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Uyarlanan parlaklık"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Parlaklık düzeyini mevcut ışık koşullarına göre ayarla"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Gece Işığı"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Gece Işığı, ekranınızın renk tonunu kırmızı yapar. Bu renk tonlaması, ekranınızı loş ışıkta daha iyi görmenizi sağlar ve daha kolay uyumanıza yardımcı olabilir."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Program"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Durum"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Gece Işığı, hava karardığında ekranınızın renk tonunu kırmızı yapar. Bu renk tonlaması, ekranınızı loş ışıkta daha iyi görmenizi sağlar ve daha kolay uyumanıza yardımcı olabilir."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Otomatik olarak aç"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Hiçbir zaman"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Özel program"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fa3a4c6..ae5b97e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -361,7 +361,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Назва"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Видалити"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Почнімо"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Розпочнімо"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Покладіть палець на датчик і заберіть його, коли відчуєте вібрацію"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Продовжуйте"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Плавно переміщуйте палець, щоб відсканувати відбиток повністю"</string>
@@ -431,7 +431,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Захистіть свій планшет"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Захистіть свій пристрій"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Захистіть свій телефон"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Щоб підвищити рівень безпеки, налаштуйте резервний спосіб блокування екрана."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Відбиток пальця може бути менш надійним, ніж ключ, PIN-код чи пароль. Налаштуйте резервний спосіб блокування екрана, щоб надійніше захистити свої дані."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Активуйте функції захисту планшета, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Активуйте функції захисту пристрою, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Активуйте функції захисту телефона, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
@@ -924,9 +924,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Регульована яскравість"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимізація рівня яскравості з урахуванням умов освітлення"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Нічний режим"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Коли ввімкнено Нічний режим, екран набуває червоного відтінку. Так зручніше дивитися на екран при тьмяному освітленні та легше заснути."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Розклад"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Коли ввімкнено Нічний режим, екран набуває червоного відтінку в нічний час. Так зручніше дивитися на екран при тьмяному освітленні та легше заснути."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Вмикати автоматично"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ніколи"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Користувацький графік"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 01c1550..9407015 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ٹھیک ہے"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف کریں"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"آئیے شروع کریں"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"آئیے شروع کریں!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"اپنی انگلی سنسر پر رکھیں اور ارتعاش محسوس ہونے کے بعد اٹھا لیں"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"جاری رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"اپنے فنگرپرنٹ کے تمام حصوں کو شامل کرنے کیلئے اپنی انگلی کو تھوڑی سی حرکت دیں"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"اپنے ٹیبلٹ کا تحفظ کریں"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"اپنے آلہ کا تحفظ کریں"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"اپنے فون کا تحفظ کریں"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"اضافی سیکیورٹی کیلئے ایک بیک اپ اسکرین قفل سیٹ اپ کریں۔"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"‏ایک طاقتور پیٹرن، PIN یا پاسورڈ کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔ اضافی سیکیورٹی کیلئے ایک بیک اپ اسکرین قفل سیٹ اپ کریں۔"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ آلہ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ فون استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
@@ -896,9 +896,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"تغیر پذیر چمک"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"دستیاب روشنی کیلئے چمک کی سطح کو بہتر بنائیں"</string>
     <string name="night_display_title" msgid="2626451512200357686">"نائٹ لائٹ"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"نائٹ لائٹ آپ کی اسکرین کو ہلکا کر کے سرخ کر دیتی ہے۔ اس سے مدھم روشنی میں اسکرین دیکھنا یا پڑھنا آسان ہو جاتا ہے اور ممکنہ طور پر آپ کو زیادہ آسانی سے سونے میں مدد بھی کرتی ہے۔"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"شیڈول"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"اسٹیٹس"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"رات کی روشنی آپ کی اسکرین کو رات کو ہلکا کرکے سرخ کر دیتی ہے۔ اس سے مدھم روشنی میں اسکرین دیکھنا یا پڑھنا آسان ہو جاتا ہے اور ممکنہ طور پر آپ کو زیادہ آسانی سے سونے میں مدد بھی کرتی ہے۔"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"خودکار طور پر آن کریں"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"کبھی نہیں"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"حسب ضرورت شیڈول"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index db1ee94..d9788ff 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nomi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"O‘chirish"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Boshladik"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Boshladik!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmog‘ingizni skaner ustiga qo‘yib, tebranishni his qilguncha bosib turing"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Davom eting"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmoq izi to‘liq olinishi uchun barmog‘ingizni sekin harakatlantiring."</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Planshetingizni himoyalang"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Qurilmangizni himoyalang"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Telefoningizni himoyalang"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ekran qulfi uchun qo‘shimcha usulni ham tanlang."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Barmoq izining xavfsizlik darajasi grafik kalit, PIN kod yoki parolnikiga qaraganda pastroq. Ekran qulfi uchun qo‘shimcha usulni ham tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu planshetdan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu qurilmadan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu telefondan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Moslashuvchan yorqinlik"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Yorqinlikni yorug‘lik darajasiga qarab moslashtirish"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Tungi rejim"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Tungi rejim ekraningiz tusini qizg‘ish rangga o‘zgartiradi. Bu ekranga xira yorug‘da qarashni osonlashtiradi va osonroq uyquga ketishga yordamlashadi."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Jadval"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Holati"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Tungi rejim kech tushishi bilan ekraningiz tusini qizg‘ish rangga o‘zgartiradi. Bu ekranga xira yorug‘da qarashni osonlashtiradi va osonroq uyquga ketishga yordamlashadi."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Avtomatik yoqish"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Hech qachon"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Maxsus jadval"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 16c34d2..af36931 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Tên"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Xóa"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Hãy bắt đầu"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Hãy bắt đầu!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Đặt ngón tay của bạn lên cảm biến và nhấc lên sau khi bạn cảm thấy rung"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Tiếp tục"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Di chuyển ngón tay của bạn một chút để thêm tất cả các phần khác nhau của dấu vân tay"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Bảo vệ máy tính bảng của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Bảo vệ thiết bị của bạn"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Bảo vệ điện thoại của bạn"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Để tăng cường bảo mật, hãy thiết lập khóa màn hình dự phòng."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Vân tay có thể kém an toàn so với hình mở khóa, mã PIN hoặc mật khẩu khó đoán. Để tăng cường bảo mật, hãy thiết lập khóa màn hình dự phòng."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Độ sáng thích nghi"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Tối ưu hóa độ sáng cho ánh sáng có sẵn"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Đèn đọc sách"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Tính năng Đèn đọc sách phủ màu đỏ cho màn hình của bạn vào ban đêm. Điều này giúp bạn dễ nhìn màn hình hoặc đọc trong ánh sáng mờ hơn và có thể ngủ dễ hơn."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Lịch biểu"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Trạng thái"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Tính năng Đèn đọc sách phủ màu đỏ cho màn hình của bạn vào ban đêm. Điều này giúp bạn dễ nhìn màn hình hoặc đọc trong ánh sáng mờ hơn và có thể ngủ dễ hơn."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Tự động bật"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Không bao giờ"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Lịch biểu tùy chỉnh"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6944fbe0..0bd3953 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -355,8 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名称"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"确定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"删除"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_start_title (951888937749663602) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"我们开始吧！"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"将您的手指放在指纹传感器上，感觉到振动后移开手指"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"继续触摸"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"略微移动手指，以便传感器更完整地记录下您的指纹"</string>
@@ -426,8 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"保护您的平板电脑"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"保护您的设备"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"为手机启用保护功能"</string>
-    <!-- no translation found for setup_lock_settings_picker_fingerprint_message (5585650064305600578) -->
-    <skip />
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"指纹识别的安全性可能不及安全系数高的图案、PIN 码或密码。为提高安全性，请设置备用屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"启用设备保护功能可防止他人在未经您允许的情况下使用此平板电脑。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"启用设备保护功能可防止他人在未经您允许的情况下使用此设备。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"启用设备保护功能可防止他人在未经您允许的情况下使用此手机。请选择您要使用的屏幕锁定方式。"</string>
@@ -908,12 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"自动调节亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"根据环境光线情况优化亮度"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜间模式"</string>
-    <!-- no translation found for night_display_text (4535302797673277668) -->
-    <skip />
-    <!-- no translation found for night_display_category_schedule (2044072617637348966) -->
-    <skip />
-    <!-- no translation found for night_display_category_status (1952928783124400330) -->
-    <skip />
+    <string name="night_display_text" msgid="8753843222371219454">"夜间模式会在晚上将您的屏幕色调调节为红色，让您在光线昏暗的环境下可以更舒适地查看屏幕或阅读文字，并可能有助于您入睡。"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自动开启"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"永不"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"自定义时间安排"</string>
@@ -1273,10 +1266,10 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入SIM卡，然后重新启动"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作资料位置信息"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"工作资料存储位置"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精确度"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"低耗电量"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"节电"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"仅限设备"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置信息：关闭"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 60d00fa..69077b5 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"開始加入指紋"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"開始加入指紋！"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將手指放在感應器上，直至感到震動時放開"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"請繼續"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"輕輕移動您的手指，以加入指紋的所有部分"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"保護您的平板電腦"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"保護您的裝置"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"保護您的手機"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"請設定備援螢幕鎖定方式以加強保安。"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"相對於複雜的上鎖圖形、PIN 或密碼，指紋識別的安全性較低。請設定後備螢幕鎖定方式以加強保安。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此平板電腦。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此裝置。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此手機。請選擇您想使用的螢幕鎖定功能。"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"自動調校亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"按環境光線優化亮度"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜燈模式"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"「夜燈模式」會將您的螢幕轉成紅色，讓您在光線昏暗的環境下輕易觀看螢幕內容或閱讀，並可能有助您更容易入睡。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"設定時間"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"狀態"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"「夜燈模式」會在夜間將您的顯示屏轉成紅色，讓您在光線昏暗的環境下輕易觀看螢幕內容或閱讀，並可能有助您更容易入睡。"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自動開啟"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"永不"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"自訂時段"</string>
@@ -2542,7 +2540,7 @@
     <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="sound_settings_summary" msgid="4100853606668287965">"鈴聲音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"鈴聲音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>%"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"鈴聲音量為 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"媒體音量"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"鬧鐘音量"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ac900b8..dd21df5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"開始註冊"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"開始註冊！"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將您的手指放在感應器上，感到震動即可移開"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"繼續輕觸"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"稍微移動您的手指以新增完整的指紋"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"保護您的平板電腦"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"保護您的裝置"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"保護您的手機"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"請設定備用螢幕鎖定方式，進一步提升安全性。"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"使用複雜的圖案、PIN 碼或密碼會比感應指紋來得安全。請設定備用的螢幕鎖定方式，進一步提升安全性。"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這台平板電腦。請選擇您要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這個裝置。請選擇您要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這支手機。請選擇您要使用的螢幕鎖定方式。"</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源調整最佳亮度"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜燈"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"夜燈功能會將您的螢幕色調改為紅色，讓您更輕鬆地在光線昏暗的環境中查看螢幕，也比較容易入睡。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"排程"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"狀態"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"夜燈功能在晚上會將您的螢幕色調改為紅色，讓您更輕鬆地在光線昏暗的環境中查看螢幕，也比較容易入睡。"</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自動開啟"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"永不"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"自訂時間表"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cf9037e..8fdf7d7 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -355,7 +355,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Igama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"KULUNGILE"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Susa"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Asiqalise"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Asiqalise!"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Beka umunwe wakho kunzwa uphinde uphakamise ngemuva kokuthi uzwe ukudlidliza"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Qhubeka"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Hambisa umunwe wakho kancane ukuze ungeze zonke izingxenye ezihlukile zezigxivizo zeminwe yakho"</string>
@@ -425,7 +425,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Vikela ithebulethi yakho"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Vikela idivayisi yakho"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Vikela ifoni yakho"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Nogkuvikela okungeziwe, setha isikrini sokukhiya."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="4384500605121098860">"Izigxivizo zakho zeminwe kungenzeka zivikeleke kancane kunephethini eqinile, i-PIN, noma iphasiwedi. Ngokuvikelwa okungeziwe, setha ukukhiya isikrini kokwenza isipele."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
@@ -906,9 +906,7 @@
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ukukhanya okuguqukayo"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Lungiselela izinga lokukhanya ekukhanyeni okutholakalayo"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ukukhanya kwasebusuku"</string>
-    <string name="night_display_text" msgid="4535302797673277668">"Ukukhanya kwasebusuku kwenza mnyama ngobubomvu isikrini sakho ebusuku. Lokhu kwenza kube lula ukubheka isikrini sakho noma kufundeke ekukhanyeni okuncane, futhi kungakusiza ukuthi ulale kalula."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ipulani"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Isimo"</string>
+    <string name="night_display_text" msgid="8753843222371219454">"Ukukhanya kwasebusuku kwenza mnyama ngobubomvu isikrini sakho ebusuku. Lokhu kwenza kube lula ukubheka isikrini sakho noma kufundeke ekukhanyeni okuncane, futhi kungakusiza ukuthi ulale kalula."</string>
     <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Vula ngokuzenzakalela"</string>
     <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Akusoze"</string>
     <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ishehuli yokuzenzakalela"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 68691de..fa17aab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -748,6 +748,8 @@
     <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
+    <!-- Introduction detail message shown in fingerprint enrollment screen in setup wizard. [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
@@ -1498,6 +1500,10 @@
     <string name="nfc_quick_toggle_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
     <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
     <string name="nfc_quick_toggle_summary" product="default">Allow data exchange when the phone touches another device</string>
+    <!-- Dialog title for NFC disclaimr [CHAR_LIMIT=40]-->
+    <string name="nfc_disclaimer_title">Turn on NFC</string>
+    <!-- Dialog title for NFC disclaimr [CHAR_LIMIT=NONE]-->
+    <string name="nfc_disclaimer_content">NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers, and interactive ads or tags.</string>
 
     <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
     <string name="android_beam_settings_title">Android Beam</string>
@@ -2214,7 +2220,7 @@
     <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
     <string name="doze_title">Ambient display</string>
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
-    <string name="doze_summary">Wake screen when you double-tap it or get new notifications. See how</string>
+    <string name="doze_summary">Wake screen when you receive notifications</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->
@@ -5996,6 +6002,9 @@
     <!-- Sound: Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
     <string name="emergency_tone_vibrate">Vibrate</string>
 
+    <!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] -->
+    <string name="boot_sounds_title">Power on sounds</string>
+
     <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=30] -->
     <string name="zen_mode_settings_title">Do not disturb</string>
 
@@ -6946,6 +6955,11 @@
     <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
     <string name="assist_access_screenshot_summary">Allow the assist app to access an image of the screen</string>
 
+    <!-- Title for the "flash" preference to determine whether a flash is shown on screen when an assistant accesses the contents of the screeen. [CHAR LIMIT=40] -->
+    <string name="assist_flash_title">Flash screen</string>
+
+    <!-- Summary for the "flash" preference to determine whether a flash is shown on screen when an assistant accesses the contents of the screeen. [CHAR LIMIT=NONE] -->
+    <string name="assist_flash_summary">Flash edges of screen when assist app accesses text from screen or screenshot</string>
 
     <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
     <string name="assist_footer">Assist apps can help you based on information from the screen you\u2019re viewing. Some apps support both launcher and voice input services to give you integrated assistance.</string>
@@ -7570,7 +7584,7 @@
     <string name="support_escalation_24_7_content_description">We\'re here for you 24 7</string>
 
     <!-- Summary text for connecting to customer support [CHAR LIMIT=NONE]-->
-    <string name="support_escalation_summary">Our support team is here to help address any issues</string>
+    <string name="support_escalation_summary">Our support team is here to help address any issue</string>
 
     <!-- Summary text for connecting to 24/7 customer support [CHAR LIMIT=NONE]-->
     <string name="support_escalation_24_7_summary">Our support team is available all day, every day</string>
@@ -7619,7 +7633,7 @@
     <string name="support_help_feedback_title">Search help &amp; send feedback</string>
 
     <!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]-->
-    <string name="support_sign_in_required_title">Sign in for support</string>
+    <string name="support_sign_in_required_title">Contact support</string>
 
     <!-- Summary text that indicates user needs to sign-in to get real time customer support. [CHAR LIMIT=NONE]-->
     <string name="support_sign_in_required_summary" translatable="false"></string>
@@ -7628,7 +7642,7 @@
     <string name="support_sign_in_button_text">Sign in</string>
 
     <!-- Button label that redirects user who needs help for signin to help screen [CHAR LIMIT=NONE]-->
-    <string name="support_sign_in_required_help">Can\'t access your account?</string>
+    <string name="support_sign_in_required_help">Can\'t sign in?</string>
 
     <!-- Dialog title displayed before initiating real time support [CHAR LIMIT=80]-->
     <string name="support_disclaimer_title">Send system information</string>
@@ -7747,9 +7761,12 @@
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string>
+    <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity or the device is locked by the carrier [CHAR_LIMIT=60] -->
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Connect to the Internet or contact your carrier</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string>
 
     <string name="automatic_storage_manager_freed_bytes"><xliff:g id="size" example="3.25MB">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
 
+
 </resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 6f55982..b5e2848 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -79,19 +79,10 @@
                 android:key="lift_to_wake"
                 android:title="@string/lift_to_wake_title" />
 
-        <PreferenceScreen
+        <SwitchPreference
                 android:key="doze"
                 android:title="@string/doze_title"
-                android:summary="@string/doze_summary" >
-                <intent
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >
-                    <extra android:name="show_drawer_menu"
-                           android:value="true" />
-                    <extra android:name="gesture_scroll_to_preference"
-                           android:value="gesture_pick_up_and_nudge" />
-                </intent>
-        </PreferenceScreen>
+                android:summary="@string/doze_summary" />
 
         <SwitchPreference
                 android:key="tap_to_wake"
diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
index c5d4ab4..f8b40b1 100644
--- a/res/xml/gesture_settings.xml
+++ b/res/xml/gesture_settings.xml
@@ -37,10 +37,4 @@
         android:summary="@string/double_twist_for_camera_mode_summary"
         settings:animation="@raw/gesture_twist"/>
 
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_pick_up_and_nudge"
-        android:title="@string/ambient_display_title"
-        android:summary="@string/ambient_display_summary"
-        settings:animation="@raw/gesture_ambient_tap"/>
-
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index 6984f88..7d4928d 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -36,6 +36,12 @@
         android:title="@string/assist_access_screenshot_title"
         android:summary="@string/assist_access_screenshot_summary"/>
 
+    <SwitchPreference
+            android:key="flash"
+            android:title="@string/assist_flash_title"
+            android:summary="@string/assist_flash_summary"
+    />
+
     <com.android.settings.voice.VoiceInputListPreference
             android:key="voice_input_settings"
             android:title="@string/voice_input_settings_title"
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
index 66535e3..da67d03 100644
--- a/res/xml/other_sound_settings.xml
+++ b/res/xml/other_sound_settings.xml
@@ -55,6 +55,11 @@
             android:title="@string/dock_audio_media_title"
             android:summary="%s" />
 
+    <!-- Boot sounds -->
+    <SwitchPreference
+            android:key="boot_sounds"
+            android:title="@string/boot_sounds_title" />
+
     <!-- Emergency tone -->
     <DropDownPreference
             android:key="emergency_tone"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c988e31..dbcb277 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -2350,11 +2350,12 @@
             } else if (isSimLockedDevice()) {
                 oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device;
             } else if (!isOemUnlockAllowed()) {
-                // If the device isn't SIM-locked but OEM unlock is disabled by user restriction,
-                // this means the device hasn't been able to confirm whether SIM-lock or any other
-                // restrictions apply (or hasn't been able to apply such restrictions yet). Ask the
-                // user to connect to the internet in order to retrieve all restrictions.
-                oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_connectivity;
+                // If the device isn't SIM-locked but OEM unlock is disabled by the system via the
+                // user restriction, this means either some other carrier restriction is in place or
+                // the device hasn't been able to confirm which restrictions (SIM-lock or otherwise)
+                // apply.
+                oemUnlockSummary =
+                    R.string.oem_unlock_enable_disabled_summary_connectivity_or_locked;
             }
             mEnableOemUnlock.setSummary(getString(oemUnlockSummary));
         }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 2821eb2..f7b9443 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -96,6 +96,7 @@
     private ListPreference mNightModePreference;
     private Preference mScreenSaverPreference;
     private SwitchPreference mLiftToWakePreference;
+    private SwitchPreference mDozePreference;
     private SwitchPreference mTapToWakePreference;
     private SwitchPreference mAutoBrightnessPreference;
     private SwitchPreference mCameraGesturePreference;
@@ -142,7 +143,10 @@
             removePreference(KEY_LIFT_TO_WAKE);
         }
 
-        if (!isDozeAvailable(activity)) {
+        if (isDozeAvailable(activity)) {
+            mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);
+            mDozePreference.setOnPreferenceChangeListener(this);
+        } else {
             removePreference(KEY_DOZE);
         }
 
@@ -356,6 +360,12 @@
             mTapToWakePreference.setChecked(value != 0);
         }
 
+        // Update doze if it is available.
+        if (mDozePreference != null) {
+            int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);
+            mDozePreference.setChecked(value != 0);
+        }
+
         // Update camera gesture #1 if it is available.
         if (mCameraGesturePreference != null) {
             int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
@@ -403,6 +413,10 @@
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);
         }
+        if (preference == mDozePreference) {
+            boolean value = (Boolean) objValue;
+            Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
+        }
         if (preference == mTapToWakePreference) {
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);
@@ -426,6 +440,14 @@
     }
 
     @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference == mDozePreference) {
+            MetricsLogger.action(getActivity(), MetricsEvent.ACTION_AMBIENT_DISPLAY);
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    @Override
     protected int getHelpResource() {
         return R.string.help_uri_display;
     }
diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index ad0e41f..6d359f2 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -20,6 +20,7 @@
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.app.usage.UsageStatsManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
@@ -29,6 +30,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.os.IBinder;
 import android.os.ResultReceiver;
@@ -63,6 +66,7 @@
 
     private int mCurrentTypeIndex;
     private boolean mInProvisionCheck;
+    private UsageStatsManagerWrapper mUsageManagerWrapper;
     private ArrayList<Integer> mCurrentTethers;
     private ArrayMap<Integer, List<ResultReceiver>> mPendingCallbacks;
 
@@ -87,6 +91,9 @@
         mPendingCallbacks.put(ConnectivityManager.TETHERING_USB, new ArrayList<ResultReceiver>());
         mPendingCallbacks.put(
                 ConnectivityManager.TETHERING_BLUETOOTH, new ArrayList<ResultReceiver>());
+        if (mUsageManagerWrapper == null) {
+            mUsageManagerWrapper = new UsageStatsManagerWrapper(this);
+        }
     }
 
     @Override
@@ -228,20 +235,46 @@
 
     private void startProvisioning(int index) {
         if (index < mCurrentTethers.size()) {
-            String provisionAction = getResources().getString(
-                    com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui);
-            if (DEBUG) Log.d(TAG, "Sending provisioning broadcast: " + provisionAction + " type: "
-                    + mCurrentTethers.get(index));
-            Intent intent = new Intent(provisionAction);
-            int type = mCurrentTethers.get(index);
-            intent.putExtra(TETHER_CHOICE, type);
-            intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+            Intent intent = getProvisionBroadcastIntent(index);
+            setEntitlementAppActive(index);
+
+            if (DEBUG) Log.d(TAG, "Sending provisioning broadcast: " + intent.getAction()
+                    + " type: " + mCurrentTethers.get(index));
 
             sendBroadcast(intent);
             mInProvisionCheck = true;
         }
     }
 
+    private Intent getProvisionBroadcastIntent(int index) {
+        String provisionAction = getResources().getString(
+                com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui);
+        Intent intent = new Intent(provisionAction);
+        int type = mCurrentTethers.get(index);
+        intent.putExtra(TETHER_CHOICE, type);
+        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+        return intent;
+    }
+
+    private void setEntitlementAppActive(int index) {
+        final PackageManager packageManager = getPackageManager();
+        Intent intent = getProvisionBroadcastIntent(index);
+        List<ResolveInfo> resolvers =
+                packageManager.queryBroadcastReceivers(intent, PackageManager.MATCH_ALL);
+        if (resolvers.isEmpty()) {
+            Log.e(TAG, "No found BroadcastReceivers for provision intent.");
+            return;
+        }
+
+        for (ResolveInfo resolver : resolvers) {
+            if (resolver.activityInfo.applicationInfo.isSystemApp()) {
+                String packageName = resolver.activityInfo.packageName;
+                mUsageManagerWrapper.setAppInactive(packageName, false);
+            }
+        }
+    }
+
     private void scheduleAlarm() {
         Intent intent = new Intent(this, TetherService.class);
         intent.putExtra(ConnectivityManager.EXTRA_RUN_PROVISION, true);
@@ -335,4 +368,26 @@
         }
     };
 
+    @VisibleForTesting
+    void setUsageStatsManagerWrapper(UsageStatsManagerWrapper wrapper) {
+        mUsageManagerWrapper = wrapper;
+    }
+
+    /**
+     * A static helper class used for tests. UsageStatsManager cannot be mocked out becasue
+     * it's marked final. This class can be mocked out instead.
+     */
+    @VisibleForTesting
+    public static class UsageStatsManagerWrapper {
+        private final UsageStatsManager mUsageStatsManager;
+
+        UsageStatsManagerWrapper(Context context) {
+            mUsageStatsManager = (UsageStatsManager)
+                    context.getSystemService(Context.USAGE_STATS_SERVICE);
+        }
+
+        void setAppInactive(String packageName, boolean isInactive) {
+            mUsageStatsManager.setAppInactive(packageName, isInactive);
+        }
+    }
 }
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 7484b84..0af6ffa 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -363,7 +363,12 @@
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
         if (wfcEnabled) {
-            preferenceScreen.addPreference(mButtonWfcMode);
+            if (mEditableWfcMode) {
+                preferenceScreen.addPreference(mButtonWfcMode);
+            } else {
+                // Don't show WFC mode preference if it's not editable.
+                preferenceScreen.removePreference(mButtonWfcMode);
+            }
             if (updateAddressEnabled) {
                 preferenceScreen.addPreference(mUpdateAddress);
             } else {
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
index 02875b6..9947aa2 100644
--- a/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@ -24,6 +24,8 @@
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
+
+import com.android.internal.app.AssistUtils;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -39,10 +41,12 @@
     private static final String KEY_CONTEXT = "context";
     private static final String KEY_SCREENSHOT = "screenshot";
     private static final String KEY_VOICE_INPUT = "voice_input_settings";
+    private static final String KEY_FLASH = "flash";
 
     private DefaultAssistPreference mDefaultAssitPref;
     private SwitchPreference mContextPref;
     private SwitchPreference mScreenshotPref;
+    private SwitchPreference mFlashPref;
     private VoiceInputListPreference mVoiceInputPref;
     private Handler mHandler = new Handler();
 
@@ -62,6 +66,9 @@
         mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT);
         mScreenshotPref.setOnPreferenceChangeListener(this);
 
+        mFlashPref = (SwitchPreference) findPreference(KEY_FLASH);
+        mFlashPref.setOnPreferenceChangeListener(this);
+
         mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
         updateUi();
     }
@@ -76,7 +83,10 @@
         if (preference == mContextPref) {
             Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
                     (boolean) newValue ? 1 : 0);
-            postGuardScreenshotPref();
+            mHandler.post(() -> {
+                guardScreenshotPref();
+                guardFlashPref();
+            });
             return true;
         }
         if (preference == mScreenshotPref) {
@@ -84,6 +94,11 @@
                     (boolean) newValue ? 1 : 0);
             return true;
         }
+        if (preference == mFlashPref) {
+            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_DISCLOSURE_ENABLED,
+                    (boolean) newValue ? 1 : 0);
+            return true;
+        }
         if (preference == mDefaultAssitPref) {
             String newAssitPackage = (String)newValue;
             if (newAssitPackage == null ||
@@ -101,15 +116,6 @@
         return false;
     }
 
-    private void postGuardScreenshotPref() {
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                guardScreenshotPref();
-            }
-        });
-    }
-
     private void guardScreenshotPref() {
         boolean isChecked = mContextPref.isChecked();
         boolean screenshotPrefWasSet = Settings.Secure.getInt(
@@ -118,6 +124,17 @@
         mScreenshotPref.setChecked(isChecked && screenshotPrefWasSet);
     }
 
+    private void guardFlashPref() {
+        ComponentName assistant = mDefaultAssitPref.getCurrentAssist();
+
+        boolean isContextChecked = mContextPref.isChecked();
+        boolean willShowFlash = AssistUtils.shouldDisclose(getContext(), assistant);
+        boolean isSystemAssistant = AssistUtils.isPreinstalledAssistant(getContext(), assistant);
+
+        mFlashPref.setEnabled(isContextChecked && isSystemAssistant);
+        mFlashPref.setChecked(willShowFlash);
+    }
+
     private void updateUi() {
         mDefaultAssitPref.refreshAssistApps();
         mVoiceInputPref.refreshVoiceInputs();
@@ -130,6 +147,13 @@
         } else {
             getPreferenceScreen().removePreference(mContextPref);
             getPreferenceScreen().removePreference(mScreenshotPref);
+            getPreferenceScreen().removePreference(mFlashPref);
+        }
+
+        if (hasAssistant && AssistUtils.allowDisablingAssistDisclosure(getContext())) {
+            getPreferenceScreen().addPreference(mFlashPref);
+        } else {
+            getPreferenceScreen().removePreference(mFlashPref);
         }
 
         if (isCurrentAssistVoiceService()) {
@@ -140,6 +164,7 @@
         }
 
         guardScreenshotPref();
+        guardFlashPref();
     }
 
     private boolean isCurrentAssistVoiceService() {
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index ded7e58..b176efd 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -67,7 +67,7 @@
     private EditText mPairingView;
     private Button mOkButton;
     private LocalBluetoothProfile mPbapClientProfile;
-
+    private boolean mReceiverRegistered;
 
     /**
      * Dismiss the dialog if the bond state changes to bonded or none,
@@ -98,8 +98,7 @@
         super.onCreate(savedInstanceState);
 
         Intent intent = getIntent();
-        if (!intent.getAction().equals(BluetoothDevice.ACTION_PAIRING_REQUEST))
-        {
+        if (!intent.getAction().equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
             Log.e(TAG, "Error: this activity may be started only with intent " +
                   BluetoothDevice.ACTION_PAIRING_REQUEST);
             finish();
@@ -167,6 +166,7 @@
          */
         registerReceiver(mReceiver, new IntentFilter(BluetoothDevice.ACTION_PAIRING_CANCEL));
         registerReceiver(mReceiver, new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
+        mReceiverRegistered = true;
     }
 
     private void createUserEntryDialog() {
@@ -373,7 +373,10 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        unregisterReceiver(mReceiver);
+        if (mReceiverRegistered) {
+            mReceiverRegistered = false;
+            unregisterReceiver(mReceiver);
+        }
     }
 
     public void afterTextChanged(Editable s) {
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 9ce332d..3148aed 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -267,7 +267,7 @@
 
             Log.d(TAG, "Setting Bluetooth Discoverable Timeout = " + mTimeout);
 
-            if (mTimeout < 0 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
+            if (mTimeout < 1 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
                 mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
             }
         } else {
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index ecf6497..ca68a74 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.dashboard;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
@@ -110,21 +109,6 @@
         return mSuggestions;
     }
 
-    public Tile getTile(ComponentName component) {
-        if (mCategories == null) {
-            return null;
-        }
-        for (int i = 0; i < mCategories.size(); i++) {
-            for (int j = 0; j < mCategories.get(i).tiles.size(); j++) {
-                Tile tile = mCategories.get(i).tiles.get(j);
-                if (component.equals(tile.intent.getComponent())) {
-                    return tile;
-                }
-            }
-        }
-        return null;
-    }
-
     public void setCategoriesAndSuggestions(List<DashboardCategory> categories,
             List<Tile> suggestions) {
         mSuggestions = suggestions;
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 778d620..4232852 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -28,8 +28,10 @@
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
+
 import com.android.settings.SettingsActivity;
 import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.drawer.Tile;
 
 import java.lang.reflect.Field;
@@ -87,9 +89,24 @@
             public void run() {
                 // Since tiles are not always cached (like on locale change for instance),
                 // we need to always get the latest one.
-                Tile tile = mAdapter.getTile(component);
-                if (tile == null) return;
-                if (DEBUG) Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+                if (!(mActivity instanceof SettingsDrawerActivity)) {
+                    if (DEBUG) {
+                        Log.d(TAG, "Can't get category list.");
+                    }
+                    return;
+                }
+                final List<DashboardCategory> categories =
+                        ((SettingsDrawerActivity) mActivity).getDashboardCategories();
+                final Tile tile = getTileFromCategory(categories, component);
+                if (tile == null) {
+                    if (DEBUG) {
+                        Log.d(TAG, "Can't find tile for " + component);
+                    }
+                    return;
+                }
+                if (DEBUG) {
+                    Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+                }
                 tile.summary = summary;
                 mAdapter.notifyChanged(tile);
             }
@@ -187,6 +204,27 @@
         }
     }
 
+    private Tile getTileFromCategory(List<DashboardCategory> categories, ComponentName component) {
+        if (categories == null) {
+            if (DEBUG) {
+                Log.d(TAG, "Category is null, can't find tile");
+            }
+            return null;
+        }
+        final int categorySize = categories.size();
+        for (int i = 0; i < categorySize; i++) {
+            final DashboardCategory category = categories.get(i);
+            final int tileCount = category.tiles.size();
+            for (int j = 0; j < tileCount; j++) {
+                final Tile tile = category.tiles.get(j);
+                if (component.equals(tile.intent.getComponent())) {
+                    return tile;
+                }
+            }
+        }
+        return null;
+    }
+
     public interface SummaryProvider {
         void setListening(boolean listening);
     }
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 4ee28c6..b5c130c 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -450,9 +450,15 @@
                         final SupportPhone phone = mSupportFeatureProvider
                                 .getSupportPhones(mSelectedCountry, true /* isTollFree */);
                         if (phone != null) {
-                            MetricsLogger.action(mActivity,
-                                    MetricsProto.MetricsEvent.ACTION_SUPPORT_DAIL_TOLLFREE);
-                            mActivity.startActivity(phone.getDialIntent());
+                            final Intent intent = phone.getDialIntent();
+                            final boolean canDial = !mActivity.getPackageManager()
+                                    .queryIntentActivities(intent, 0)
+                                    .isEmpty();
+                            if (canDial) {
+                                MetricsLogger.action(mActivity,
+                                        MetricsProto.MetricsEvent.ACTION_SUPPORT_DAIL_TOLLFREE);
+                                mActivity.startActivity(intent);
+                            }
                         }
                         break;
                     }
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index a17c8fc..e9aa8c9 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -92,8 +92,10 @@
         NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate);
         mBillingCycle.setSummary(getString(R.string.billing_cycle_summary, policy != null ?
                 policy.cycleDay : 1));
-        mDataWarning.setSummary(Formatter.formatFileSize(getContext(), policy != null
-                ? policy.warningBytes : DataUsageController.DEFAULT_WARNING_LEVEL));
+        mDataWarning.setSummary(Formatter.formatFileSize(getContext(),
+                policy != null
+                        ? policy.warningBytes
+                        : mDataUsageController.getDefaultWarningLevel()));
         if (policy != null && policy.limitBytes != LIMIT_DISABLED) {
             mDataLimit.setSummary(Formatter.formatFileSize(getContext(), policy.limitBytes));
             mDataLimit.setEnabled(true);
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index cc8e823..e7f4cfe 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -20,6 +20,7 @@
 import android.content.res.Resources;
 import android.os.UserHandle;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
@@ -52,6 +53,11 @@
     @Override
     protected void initViews() {
         super.initViews();
+
+        TextView description = (TextView) findViewById(R.id.description_text);
+        description.setText(
+                R.string.security_settings_fingerprint_enroll_introduction_message_setup);
+
         Button nextButton = getNextButton();
         nextButton.setText(
                 R.string.security_settings_fingerprint_enroll_introduction_continue_setup);
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index ca8d778..8f028b6 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -20,9 +20,7 @@
 import android.content.res.Resources;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings.Secure;
 import android.support.v7.preference.Preference;
@@ -52,16 +50,11 @@
     private static final String TAG = "GestureSettings";
     private static final String PREF_KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
     private static final String PREF_KEY_DOUBLE_TWIST = "gesture_double_twist";
-    private static final String PREF_KEY_PICK_UP_AND_NUDGE = "gesture_pick_up_and_nudge";
     private static final String PREF_KEY_SWIPE_DOWN_FINGERPRINT = "gesture_swipe_down_fingerprint";
-    private static final String DEBUG_DOZE_COMPONENT = "debug.doze.component";
-    private static final String ARG_SCROLL_TO_PREFERENCE = "gesture_scroll_to_preference";
     private static final int PREF_ID_DOUBLE_TAP_POWER = 0;
     private static final int PREF_ID_DOUBLE_TWIST = 1;
-    private static final int PREF_ID_PICK_UP_AND_NUDG = 2;
-    private static final int PREF_ID_SWIPE_DOWN_FINGERPRINT = 3;
+    private static final int PREF_ID_SWIPE_DOWN_FINGERPRINT = 2;
 
-    private int mScrollPosition = -1;
     private List<GesturePreference> mPreferences;
 
     @Override
@@ -80,18 +73,10 @@
             removePreference(PREF_KEY_DOUBLE_TAP_POWER);
         }
 
-        // Ambient Display
-        if (isDozeAvailable(context)) {
-            int dozeEnabled = Secure.getInt(getContentResolver(), Secure.DOZE_ENABLED, 1);
-            addPreference(PREF_KEY_PICK_UP_AND_NUDGE, dozeEnabled != 0, PREF_ID_DOUBLE_TWIST);
-        } else {
-            removePreference(PREF_KEY_PICK_UP_AND_NUDGE);
-        }
-
         // Fingerprint slide for notifications
         if (isSystemUINavigationAvailable(context)) {
             addPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT, isSystemUINavigationEnabled(context),
-                    PREF_ID_PICK_UP_AND_NUDG);
+                    PREF_ID_SWIPE_DOWN_FINGERPRINT);
         } else {
             removePreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
         }
@@ -100,23 +85,11 @@
         if (isDoubleTwistAvailable(context)) {
             int doubleTwistEnabled = Secure.getInt(
                     getContentResolver(), Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
-            addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0,
-                    PREF_ID_SWIPE_DOWN_FINGERPRINT);
+            addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0, PREF_ID_DOUBLE_TWIST);
         } else {
             removePreference(PREF_KEY_DOUBLE_TWIST);
         }
 
-        if (savedInstanceState == null) {
-            final Bundle args = getArguments();
-            if (args != null && args.containsKey(ARG_SCROLL_TO_PREFERENCE)) {
-                String prefKey = args.getString(ARG_SCROLL_TO_PREFERENCE);
-                GesturePreference pref = (GesturePreference) findPreference(prefKey);
-                if (pref != null) {
-                    mScrollPosition = pref.getOrder();
-                }
-            }
-        }
-
     }
 
     @Override
@@ -124,9 +97,6 @@
                              Bundle savedInstanceState) {
         View view = super.onCreateView(inflater, container, savedInstanceState);
         RecyclerView listview = getListView();
-        if (mScrollPosition >= 0) {
-            listview.scrollToPosition(mScrollPosition);
-        }
         listview.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
@@ -155,8 +125,6 @@
         if (PREF_KEY_DOUBLE_TAP_POWER.equals(key)) {
             Secure.putInt(getContentResolver(),
                     Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? 0 : 1);
-        } else if (PREF_KEY_PICK_UP_AND_NUDGE.equals(key)) {
-            Secure.putInt(getContentResolver(), Secure.DOZE_ENABLED, enabled ? 1 : 0);
         } else if (PREF_KEY_SWIPE_DOWN_FINGERPRINT.equals(key)) {
             Secure.putInt(getContentResolver(),
                     Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, enabled ? 1 : 0);
@@ -182,15 +150,6 @@
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
     }
 
-    private static boolean isDozeAvailable(Context context) {
-        String name = Build.IS_DEBUGGABLE ? SystemProperties.get(DEBUG_DOZE_COMPONENT) : null;
-        if (TextUtils.isEmpty(name)) {
-            name = context.getResources().getString(
-                    com.android.internal.R.string.config_dozeComponent);
-        }
-        return !TextUtils.isEmpty(name);
-    }
-
     private static boolean isSystemUINavigationAvailable(Context context) {
         return context.getResources().getBoolean(
                 com.android.internal.R.bool.config_supportSystemNavigationKeys);
@@ -246,9 +205,6 @@
                 if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
                     result.add(PREF_KEY_DOUBLE_TAP_POWER);
                 }
-                if (!isDozeAvailable(context)) {
-                    result.add(PREF_KEY_PICK_UP_AND_NUDGE);
-                }
                 if (!isSystemUINavigationAvailable(context)) {
                     result.add(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
                 }
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index 2ea6a79..c538a7b 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -25,10 +25,13 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.SystemProperties;
 import android.os.Vibrator;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings.Global;
 import android.provider.Settings.System;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
 import android.telephony.TelephonyManager;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -68,6 +71,10 @@
     private static final String KEY_DOCK_AUDIO_MEDIA = "dock_audio_media";
     private static final String KEY_EMERGENCY_TONE = "emergency_tone";
 
+    // Boot Sounds needs to be a system property so it can be accessed during boot.
+    private static final String KEY_BOOT_SOUNDS = "boot_sounds";
+    private static final String PROPERTY_BOOT_SOUNDS = "persist.sys.bootanim.play_sound";
+
     private static final SettingPref PREF_DIAL_PAD_TONES = new SettingPref(
             TYPE_SYSTEM, KEY_DIAL_PAD_TONES, System.DTMF_TONE_WHEN_DIALING, DEFAULT_ON) {
         @Override
@@ -174,6 +181,8 @@
         PREF_EMERGENCY_TONE,
     };
 
+    private SwitchPreference mBootSounds;
+
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
 
     private Context mContext;
@@ -199,6 +208,9 @@
         for (SettingPref pref : PREFS) {
             pref.init(this);
         }
+
+        mBootSounds = (SwitchPreference) findPreference(KEY_BOOT_SOUNDS);
+        mBootSounds.setChecked(SystemProperties.getBoolean(PROPERTY_BOOT_SOUNDS, true));
     }
 
     @Override
@@ -213,6 +225,16 @@
         mSettingsObserver.register(false);
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference == mBootSounds) {
+            SystemProperties.set(PROPERTY_BOOT_SOUNDS, mBootSounds.isChecked() ? "1" : "0");
+            return false;
+        } else {
+            return super.onPreferenceTreeClick(preference);
+        }
+    }
+
     private static boolean hasDockSettings(Context context) {
         return context.getResources().getBoolean(R.bool.has_dock_settings);
     }
diff --git a/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
index 3e88046..fdf4707 100644
--- a/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
+++ b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
@@ -32,16 +32,6 @@
 import java.util.Calendar;
 
 public class ZenModeScheduleDaysSelection extends ScrollView {
-    public static final int[] DAYS = {
-        Calendar.SUNDAY,
-        Calendar.MONDAY,
-        Calendar.TUESDAY,
-        Calendar.WEDNESDAY,
-        Calendar.THURSDAY,
-        Calendar.FRIDAY,
-        Calendar.SATURDAY,
-    };
-
     // per-instance to ensure we're always using the current locale
     private final SimpleDateFormat mDayFormat = new SimpleDateFormat("EEEE");
     private final SparseBooleanArray mDays = new SparseBooleanArray();
@@ -61,9 +51,10 @@
         }
         mLayout.setOrientation(LinearLayout.VERTICAL);
         final Calendar c = Calendar.getInstance();
+        int[] daysOfWeek = getDaysOfWeekForLocale(c);
         final LayoutInflater inflater = LayoutInflater.from(context);
-        for (int i = 0; i < DAYS.length; i++) {
-            final int day = DAYS[i];
+        for (int i = 0; i < daysOfWeek.length; i++) {
+            final int day = daysOfWeek[i];
             final CheckBox checkBox = (CheckBox) inflater.inflate(R.layout.zen_schedule_rule_day,
                     this, false);
             c.set(Calendar.DAY_OF_WEEK, day);
@@ -95,6 +86,17 @@
         return rta;
     }
 
+    protected static int[] getDaysOfWeekForLocale(Calendar c) {
+        int[] daysOfWeek = new int[7];
+        int currentDay = c.getFirstDayOfWeek();
+        for (int i = 0; i < daysOfWeek.length; i++) {
+            if (currentDay > 7) currentDay = 1;
+            daysOfWeek[i] = currentDay;
+            currentDay++;
+        }
+        return daysOfWeek;
+    }
+
     protected void onChanged(int[] days) {
         // event hook for subclasses
     }
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
index 1c5027e..ad54689 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -44,8 +44,6 @@
 import java.util.Arrays;
 import java.util.Calendar;
 
-import static com.android.settings.notification.ZenModeScheduleDaysSelection.DAYS;
-
 public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
     private static final String KEY_DAYS = "days";
     private static final String KEY_START_TIME = "start_time";
@@ -158,8 +156,9 @@
         if (days != null && days.length > 0) {
             final StringBuilder sb = new StringBuilder();
             final Calendar c = Calendar.getInstance();
-            for (int i = 0; i < DAYS.length; i++) {
-                final int day = DAYS[i];
+            int[] daysOfWeek = ZenModeScheduleDaysSelection.getDaysOfWeekForLocale(c);
+            for (int i = 0; i < daysOfWeek.length; i++) {
+                final int day = daysOfWeek[i];
                 for (int j = 0; j < days.length; j++) {
                     if (day == days[j]) {
                         c.set(Calendar.DAY_OF_WEEK, day);
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 6ef900b..d16f24d 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -117,10 +117,6 @@
 
     private PrintersAdapter mPrintersAdapter;
 
-    // TODO: Showing sub-sub fragment does not handle the activity title
-    // so we do it but this is wrong. Do a real fix when there is time.
-    private CharSequence mOldActivityTitle;
-
     private int mLastUnfilteredItemCount;
 
     private boolean mServiceEnabled;
@@ -133,16 +129,21 @@
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View root = super.onCreateView(inflater, container, savedInstanceState);
-
-        mServiceEnabled = getArguments().getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
 
         String title = getArguments().getString(PrintSettingsFragment.EXTRA_TITLE);
         if (!TextUtils.isEmpty(title)) {
             getActivity().setTitle(title);
         }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        View root = super.onCreateView(inflater, container, savedInstanceState);
+
+        mServiceEnabled = getArguments().getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
 
         return root;
     }
@@ -177,9 +178,6 @@
 
     @Override
     public void onDestroyView() {
-        if (mOldActivityTitle != null) {
-            getActivity().getActionBar().setTitle(mOldActivityTitle);
-        }
         super.onDestroyView();
         mSwitchBar.removeOnSwitchChangeListener(this);
         mSwitchBar.hide();
diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java
index 77eb225..4dde547 100644
--- a/src/com/android/settings/support/SupportPhoneDialogFragment.java
+++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java
@@ -15,9 +15,11 @@
  */
 package com.android.settings.support;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -68,9 +70,16 @@
     @Override
     public void onClick(View v) {
         final SupportPhone phone = getArguments().getParcelable(EXTRA_PHONE);
-        MetricsLogger.action(getActivity(),
-                MetricsProto.MetricsEvent.ACTION_SUPPORT_DIAL_TOLLED);
-        getActivity().startActivity(phone.getDialIntent());
+        final Activity activity = getActivity();
+        final Intent intent = phone.getDialIntent();
+        final boolean canDial = !activity.getPackageManager()
+                .queryIntentActivities(intent, 0)
+                .isEmpty();
+        if (canDial) {
+            MetricsLogger.action(getActivity(),
+                    MetricsProto.MetricsEvent.ACTION_SUPPORT_DIAL_TOLLED);
+            getActivity().startActivity(intent);
+        }
         dismiss();
     }
 }
diff --git a/tests/unit/src/com/android/settings/TetherServiceTest.java b/tests/unit/src/com/android/settings/TetherServiceTest.java
index 09c6119..bec3e7e 100644
--- a/tests/unit/src/com/android/settings/TetherServiceTest.java
+++ b/tests/unit/src/com/android/settings/TetherServiceTest.java
@@ -35,11 +35,16 @@
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
+import android.app.usage.UsageStatsManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
@@ -61,10 +66,16 @@
 import org.mockito.MockitoAnnotations;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class TetherServiceTest extends ServiceTestCase<TetherService> {
 
     private static final String TAG = "TetherServiceTest";
+    private static final String FAKE_PACKAGE_NAME = "com.some.package.name";
+    private static final String ENTITLEMENT_PACKAGE_NAME = "com.some.entitlement.name";
     private static final String TEST_RESPONSE_ACTION = "testProvisioningResponseAction";
     private static final String TEST_NO_UI_ACTION = "testNoUiProvisioningRequestAction";
     private static final int BOGUS_RECEIVER_RESULT = -5;
@@ -75,6 +86,7 @@
 
     private TetherService mService;
     private MockResources mResources;
+    private FakeUsageStatsManagerWrapper mUsageStatsManagerWrapper;
     int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
     private int mLastTetherRequestType = TETHERING_INVALID;
     private int mProvisionResponse = BOGUS_RECEIVER_RESULT;
@@ -83,6 +95,7 @@
 
     @Mock private AlarmManager mAlarmManager;
     @Mock private ConnectivityManager mConnectivityManager;
+    @Mock private PackageManager mPackageManager;
     @Mock private WifiManager mWifiManager;
     @Mock private SharedPreferences mPrefs;
     @Mock private Editor mPrefEditor;
@@ -115,6 +128,27 @@
         when(mPrefs.edit()).thenReturn(mPrefEditor);
         when(mPrefEditor.putString(eq(CURRENT_TYPES), mStoredTypes.capture())).thenReturn(
                 mPrefEditor);
+        mUsageStatsManagerWrapper = new FakeUsageStatsManagerWrapper(mContext);
+
+        ResolveInfo systemAppResolveInfo = new ResolveInfo();
+        ActivityInfo systemActivityInfo = new ActivityInfo();
+        systemActivityInfo.packageName = ENTITLEMENT_PACKAGE_NAME;
+        ApplicationInfo systemAppInfo = new ApplicationInfo();
+        systemAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
+        systemActivityInfo.applicationInfo = systemAppInfo;
+        systemAppResolveInfo.activityInfo = systemActivityInfo;
+
+        ResolveInfo nonSystemResolveInfo = new ResolveInfo();
+        ActivityInfo nonSystemActivityInfo = new ActivityInfo();
+        nonSystemActivityInfo.packageName = FAKE_PACKAGE_NAME;
+        nonSystemActivityInfo.applicationInfo = new ApplicationInfo();
+        nonSystemResolveInfo.activityInfo = nonSystemActivityInfo;
+
+        List<ResolveInfo> resolvers = new ArrayList();
+        resolvers.add(nonSystemResolveInfo);
+        resolvers.add(systemAppResolveInfo);
+        when(mPackageManager.queryBroadcastReceivers(
+                any(Intent.class), eq(PackageManager.MATCH_ALL))).thenReturn(resolvers);
     }
 
     @Override
@@ -139,6 +173,19 @@
         assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
     }
 
+    public void testStartKeepsProvisionAppActive() {
+        setupService();
+        getService().setUsageStatsManagerWrapper(mUsageStatsManagerWrapper);
+
+        runProvisioningForType(TETHERING_WIFI);
+
+        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
+        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
+        assertFalse(mUsageStatsManagerWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
+        // Non-system handler of the intent action should stay idle.
+        assertTrue(mUsageStatsManagerWrapper.isAppInactive(FAKE_PACKAGE_NAME));
+    }
+
     public void testScheduleRechecks() {
         Intent intent = new Intent();
         intent.putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI);
@@ -192,7 +239,7 @@
         assertTrue(waitForProvisionRequest(TETHERING_WIFI));
         assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISION_FAILED));
 
-        verify(mWifiManager).setWifiApEnabled(isNull(WifiConfiguration.class), eq(false));
+        verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
     }
 
     public void testFailureStopsTethering_Usb() {
@@ -229,6 +276,19 @@
         startService(intent);
     }
 
+    private boolean waitForAppInactive(UsageStatsManager usageStatsManager, String packageName) {
+        long startTime = SystemClock.uptimeMillis();
+        while (true) {
+            if (usageStatsManager.isAppInactive(packageName)) {
+                return true;
+            }
+            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
+                return false;
+            }
+            SystemClock.sleep(SHORT_TIMEOUT);
+        }
+    }
+
     private boolean waitForProvisionRequest(int expectedType) {
         long startTime = SystemClock.uptimeMillis();
         while (true) {
@@ -308,6 +368,11 @@
         }
 
         @Override
+        public PackageManager getPackageManager() {
+            return mPackageManager;
+        }
+
+        @Override
         public Object getSystemService(String name) {
             if (ALARM_SERVICE.equals(name)) {
                 return mAlarmManager;
@@ -355,4 +420,27 @@
                     responseIntent, android.Manifest.permission.CONNECTIVITY_INTERNAL);
         }
     }
+
+    private static class FakeUsageStatsManagerWrapper
+            extends TetherService.UsageStatsManagerWrapper {
+        private final Set<String> mActivePackages;
+
+        FakeUsageStatsManagerWrapper(Context context) {
+            super(context);
+            mActivePackages = new HashSet<>();
+        }
+
+        @Override
+        void setAppInactive(String packageName, boolean isInactive) {
+            if (!isInactive) {
+                mActivePackages.add(packageName);
+            } else {
+                mActivePackages.remove(packageName);
+            }
+        }
+
+        boolean isAppInactive(String packageName) {
+            return !mActivePackages.contains(packageName);
+        }
+    }
 }