diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a345248..533da87 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Styl"</string>
     <string name="clock_color" msgid="8081608867289156163">"Kleur"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rooi"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranje"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Geel"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Geen"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Wys kennisgewings op die sluitskerm"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Kennisgewings op sluitskerm"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Bestuur hoe kennisgewings vertoon en wat om te wys"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Nog sluitskerminstellings"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privaatheid, Wat Speel, en meer"</string>
     <string name="more_colors" msgid="3191071655353004591">"Nog kleure"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 529a910..5b52797 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>፣ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ቅጥ"</string>
     <string name="clock_color" msgid="8081608867289156163">"ቀለም"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ቀይ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ብርቱካናማ"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"ቢጫ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>፣ <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ምንም"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"በማያ ገፅ ቁልፉ ላይ ማሳወቂያዎችን አሳይ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ማያ ገፅ ቁልፍ ላይ ማሳወቂያዎች"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"ማሳወቂያዎች የሚታዩበትን መንገድ እና ምን እንደሚታይ ያስተዳድሩ"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ተጨማሪ የማያ ገፅ ቁልፍ ቅንብሮች"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ግላዊነት፣ አሁን በመጫወት ላይ እና ሌሎችም"</string>
     <string name="more_colors" msgid="3191071655353004591">"ተጨማሪ ቀለማት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0017ecc..14fb53d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g> و<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"النمط"</string>
     <string name="clock_color" msgid="8081608867289156163">"اللون"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"أحمر"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"برتقالي"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"أصفر"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"\"<xliff:g id="FIRST">%1$s</xliff:g>\" و\"<xliff:g id="SECOND">%2$s</xliff:g>\""</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"بدون اختصارات"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"إظهار الإشعارات على شاشة القفل"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"الإشعارات على شاشة القفل"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"يمكنك إدارة طريقة ظهور الإشعارات وما يتم عرضه"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"المزيد من إعدادات شاشة القفل"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"الخصوصية وميزة \"التعرّف التلقائي على الموسيقى\" وغير ذلك"</string>
     <string name="more_colors" msgid="3191071655353004591">"المزيد من الألوان"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 7d43467..ca2dc18 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"শৈলী"</string>
     <string name="clock_color" msgid="8081608867289156163">"ৰং"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ৰঙা"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"কমলা"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"হালধীয়া"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"নাই"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"লক স্ক্ৰীনত জাননী দেখুৱাওক"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"লক স্ক্ৰীনত দেখা পোৱা জাননীসমূহ"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"জাননী কেনেকৈ প্ৰদৰ্শিত হয় আৰু কি দেখুওৱাব লাগে সেয়া পৰিচালনা কৰক"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"অধিক লক স্ক্ৰীনৰ ছেটিং"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"গোপনীয়তা, সদ্য পৰিৱেশিত গীত আৰু অধিক"</string>
     <string name="more_colors" msgid="3191071655353004591">"অধিক ৰং"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a253b31..2b30609 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Üslub"</string>
     <string name="clock_color" msgid="8081608867289156163">"Rəng"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Qırmızı"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Narıncı"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Sarı"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Heç biri"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Kilid ekranında bildirişləri göstərin"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Kilid ekranındakı bildirişlər"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Bildirişin görünmə formasını, nələrin göstəriləcəyini idarə edin"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Daha çox kilid ekranı ayarı"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Məxfilik, İndi Efirdə və s."</string>
     <string name="more_colors" msgid="3191071655353004591">"Digər rənglər"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c7bf1e8..d67e822 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Boja"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Crvena"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Narandžasta"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Žuta"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ništa"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Prikazuj obaveštenja na zaključanom ekranu"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Obaveštenja na zaključanom ekranu"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Upravljajte prikazom obaveštenja i sadržajem prikaza"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Još podešavanja zaključanog ekrana"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privatnost, Trenutno svira i drugo"</string>
     <string name="more_colors" msgid="3191071655353004591">"Još boja"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3b7df28..eccd21e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стыль"</string>
     <string name="clock_color" msgid="8081608867289156163">"Колер"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Чырвоны"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Аранжавы"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Жоўты"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Няма"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Паказваць апавяшчэнні на экране блакіроўкі"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Апавяшчэнні на экране блакіроўкі"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Кіруйце тым, як апавяшчэнні з’яўляюцца і што паказваюць"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Больш налад экрана блакіроўкі"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Прыватнасць, Зараз іграе і іншае"</string>
     <string name="more_colors" msgid="3191071655353004591">"Больш колераў"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a4e4cd0..c756efb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стил"</string>
     <string name="clock_color" msgid="8081608867289156163">"Цвят"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"червено"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"оранжево"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"жълто"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Няма"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Показване на известията на заключения екран"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Известия на заключения екран"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Управлявайте как да се показват известията и какво да съдържат"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Още настр. за заключения екран"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Поверителност, „Сега слушате“ и др."</string>
     <string name="more_colors" msgid="3191071655353004591">"Още цветове"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index b8fc33d..7168086 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"স্টাইল"</string>
     <string name="clock_color" msgid="8081608867289156163">"রঙ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"লাল"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"কমলা"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"হলুদ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"কোনও শর্টকাট নেই"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"লক স্ক্রিনে বিজ্ঞপ্তি দেখুন"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"লক স্ক্রিনে বিজ্ঞপ্তি"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"বিজ্ঞপ্তি কীভাবে দেখানো হবে এবং কী দেখাতে হবে তা ম্যানেজ করুন"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"লক স্ক্রিন সম্পর্কিত আরও সেটিংস"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"গোপনীয়তা, এখন চলছে এবং আরও অনেক কিছু"</string>
     <string name="more_colors" msgid="3191071655353004591">"আরও রঙ"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 7f96c5f..a691223 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Boja"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Crvena"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Narandžasta"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Žuta"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ništa"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Prikaz obavještenja na zaključanom ekranu"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Obavještenja na zaključanom ekranu"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Upravljajte prikazivanjem obavještenja i podacima koja prikazuju"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Više postavki zaključanog ekrana"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privatnost, Trenutno se reproducira i drugo"</string>
     <string name="more_colors" msgid="3191071655353004591">"Više boja"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e9857c5..cf883ab 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Color"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Vermell"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Taronja"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Groc"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Cap"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostra les notificacions a la pantalla de bloqueig"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notificacions pantalla bloqueig"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Gestiona com es mostren les notificacions i què es mostra"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Més opcions pantalla de bloqueig"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privadesa, Està sonant i més"</string>
     <string name="more_colors" msgid="3191071655353004591">"Més colors"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 60aa687..322d3fc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Styl"</string>
     <string name="clock_color" msgid="8081608867289156163">"Barva"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Červená"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranžová"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Žlutá"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Žádné"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Zobrazovat oznámení na obrazovce uzamčení"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Oznámení na obrazovce uzamčení"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Spravujte, jak se budou zobrazovat oznámení a co budou obsahovat"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Další nastavení obrazovky uzamčení"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Soukromí, Co to hraje a další"</string>
     <string name="more_colors" msgid="3191071655353004591">"Další barvy"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 60b439c..91ae10e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Farve"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rød"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Gul"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ingen"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Vis notifikationer på låseskærmen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifikationer på låseskærmen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Vælg, hvordan notifikationer vises, og hvad der skal vises"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Flere indstillinger for låseskærm"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privatliv, Find sangen m.m."</string>
     <string name="more_colors" msgid="3191071655353004591">"Flere farver"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 903e758..d50fca6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Farbe"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rot"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Gelb"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Keine"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Benachrichtigungen auf dem Sperrbildschirm einblenden"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Benachr. auf Sperrbildschirm"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Legt fest, welche Benachrichtigungen angezeigt werden und wie"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Mehr Sperrbildschirm-Einst."</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Datenschutz, Now Playing und mehr"</string>
     <string name="more_colors" msgid="3191071655353004591">"Weitere Farben"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 46fecc0..95e3703 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Στιλ"</string>
     <string name="clock_color" msgid="8081608867289156163">"Χρώμα"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Κόκκινο"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Πορτοκαλί"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Κίτρινο"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Καμία"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Εμφάνιση ειδοποιήσεων στην οθόνη κλειδώματος"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Ειδοποιήσεις στην οθόνη κλειδ."</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Διαχείριση εμφάνισης και περιεχομένου ειδοποιήσεων"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Περισσότερες ρυθμ. οθόνης κλειδ."</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Απόρρητο, Ακούγεται τώρα κ.ά."</string>
     <string name="more_colors" msgid="3191071655353004591">"Περισσότερα χρώματα"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 2d6a7af..1110f84 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Style"</string>
     <string name="clock_color" msgid="8081608867289156163">"Colour"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Red"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Yellow"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"None"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Show notifications on the lock screen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Manage how notifications appear and what to show"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"More lock screen settings"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Now Playing and more"</string>
     <string name="more_colors" msgid="3191071655353004591">"More colours"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index ae93486..de65e26 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Style"</string>
     <string name="clock_color" msgid="8081608867289156163">"Color"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Clock color"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Match the wallpaper theme or choose your own color"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Red"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Yellow"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"None"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Show notifications on the lock screen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Manage how notifications appear and what to show"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"More lock screen settings"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Now Playing, and more"</string>
     <string name="more_colors" msgid="3191071655353004591">"More Colors"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2d6a7af..1110f84 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Style"</string>
     <string name="clock_color" msgid="8081608867289156163">"Colour"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Red"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Yellow"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"None"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Show notifications on the lock screen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Manage how notifications appear and what to show"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"More lock screen settings"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Now Playing and more"</string>
     <string name="more_colors" msgid="3191071655353004591">"More colours"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2d6a7af..1110f84 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Style"</string>
     <string name="clock_color" msgid="8081608867289156163">"Colour"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Red"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Yellow"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"None"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Show notifications on the lock screen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Manage how notifications appear and what to show"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"More lock screen settings"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Now Playing and more"</string>
     <string name="more_colors" msgid="3191071655353004591">"More colours"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e1c662a..130f6a7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estilo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Color"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rojo"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Naranja"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Amarillo"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ninguno"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostrar las notificaciones en la pantalla de bloqueo"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notific. en pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Administra cómo aparecen las notificaciones y qué mostrar"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Más opciones de pant. de bloqueo"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacidad, Está sonando y más"</string>
     <string name="more_colors" msgid="3191071655353004591">"Más colores"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d50cb7b..3de0e90 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estilo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Color"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rojo"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Naranja"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Amarillo"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ninguno"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostrar notificaciones en la pantalla de bloqueo"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notif. en la pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Gestiona cómo aparecen las notificaciones y qué se muestra"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Más ajustes (pantalla de bloqueo)"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacidad, Está Sonando y más"</string>
     <string name="more_colors" msgid="3191071655353004591">"Más colores"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 96e6bbd..928f14a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stiil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Värv"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Punane"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranž"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Kollane"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Pole"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Kuva märguanded lukustuskuval"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Märguanded lukustuskuval"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Saate hallata, kuidas ja millised märguandeid kuvatakse"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Rohkem lukustuskuva seadeid"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privaatsus, Hetkel mängimas ja muu"</string>
     <string name="more_colors" msgid="3191071655353004591">"Rohkem värve"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index b69d184..ff5cb31 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estiloa"</string>
     <string name="clock_color" msgid="8081608867289156163">"Kolorea"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Gorria"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Laranja"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Horia"</string>
@@ -101,7 +105,7 @@
     <string name="use_style_button" msgid="1754493078383627019">"Erabili <xliff:g id="ID_1">%1$s</xliff:g> estiloa"</string>
     <string name="no_thanks" msgid="7286616980115687627">"Ez"</string>
     <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g> erlojuaren aurrebista"</string>
-    <string name="something_went_wrong" msgid="529840112449799117">"Arazo bat izan da."</string>
+    <string name="something_went_wrong" msgid="529840112449799117">"Arazoren bat izan da."</string>
     <string name="theme_preview_icons_section_title" msgid="7064768910744000643">"Koloreak / Ikonoak"</string>
     <string name="style_info_description" msgid="2612473574431003251">"Letra-tipoen, ikonoen, aplikazio-formen eta koloreen aurrebista"</string>
     <string name="accessibility_custom_font_title" msgid="966867359157303705">"Letra pertsonalizatua"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g> eta <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Bat ere ez"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Erakutsi jakinarazpenak pantaila blokeatuan"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Pantaila blokeatuko jakinarazpenak"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Kudeatu nola agertzen diren jakinarazpenak eta zer erakusten den"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Pantaila blokeatuaren ezarpen gehiago"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Pribatutasuna, Orain erreproduzitzen eta abar"</string>
     <string name="more_colors" msgid="3191071655353004591">"Kolore gehiago"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9d8a7eb..6d16897 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>، <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"سبک"</string>
     <string name="clock_color" msgid="8081608867289156163">"رنگ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"قرمز"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"نارنجی"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"زرد"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>، <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"هیچ‌کدام"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"نمایش اعلان‌ها در صفحه قفل"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"اعلان‌ها در صفحه قفل"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"مدیریت کردن نحوه نشان داده شدن اعلان‌ها و آنچه نشان داده می‌شود"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"تنظیمات دیگر صفحه قفل"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"«حریم خصوصی»، «درحال پخش»، و موارد دیگر"</string>
     <string name="more_colors" msgid="3191071655353004591">"رنگ‌های بیشتر"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b2f440b..bb32c63 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Tyyli"</string>
     <string name="clock_color" msgid="8081608867289156163">"Väri"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Punainen"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranssi"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Keltainen"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"–"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Näytä ilmoitukset lukitusnäytöllä"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Ilmoitukset lukitusnäytöllä"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Valitse, miten ilmoitukset näkyvät ja mitä näytetään"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Lisää lukitusnäytön asetuksia"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Yksityisyys, Musiikintunnistus ja muita"</string>
     <string name="more_colors" msgid="3191071655353004591">"Lisää värejä"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index cff8977..2941f36 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Style"</string>
     <string name="clock_color" msgid="8081608867289156163">"Couleur"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rouge"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Jaune"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Aucun"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Afficher les notifications sur l\'écran de verrouillage"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notif. sur l\'écran de verrouil."</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Gérez comment les notifications apparaissent et quoi afficher"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Paramètres écran de verrouillage"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Confidentialité, En cours de lecture, etc."</string>
     <string name="more_colors" msgid="3191071655353004591">"Plus de couleurs"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ef4528d..4f52227 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Style"</string>
     <string name="clock_color" msgid="8081608867289156163">"Couleur"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rouge"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Jaune"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Aucun"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Afficher les notifications sur l\'écran de verrouillage"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Sur l\'écran de verrouillage"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Gérer l\'affichage des notifications et leur contenu"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Autres param. écran verrouillage"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Confidentialité, En écoute et plus"</string>
     <string name="more_colors" msgid="3191071655353004591">"Autres couleurs"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7bb7a07..808e1d1 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estilo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Cor"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Vermello"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Laranxa"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Amarelo"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ningún"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostrar notificacións na pantalla de bloqueo"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notif. na pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Xestiona como aparecen as notificacións e que queres que se mostre"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Máis opcións pantalla de bloqueo"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacidade, Está soando e moito máis"</string>
     <string name="more_colors" msgid="3191071655353004591">"Máis cores"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 23cc126..ec2e568 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"શૈલી"</string>
     <string name="clock_color" msgid="8081608867289156163">"રંગ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"લાલ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"નારંગી"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"પીળો"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"એકપણ નહીં"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"લૉક સ્ક્રીન પર નોટિફિકેશન બતાવો"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"લૉક સ્ક્રીન પર નોટિફિકેશન"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"નોટિફિકેશન કેવા દેખાશે અને શું બતાવવું તે મેનેજ કરો"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"લૉક સ્ક્રીનના વધુ સેટિંગ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"પ્રાઇવસી, હમણાં વાગી રહ્યું છે અને બીજું ઘણું"</string>
     <string name="more_colors" msgid="3191071655353004591">"વધુ રંગો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 40373c9..414af8a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"स्टाइल"</string>
     <string name="clock_color" msgid="8081608867289156163">"रंग"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"लाल"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"नारंगी"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"पीला"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"कोई नहीं"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"लॉक स्क्रीन पर सूचनाएं दिखाएं"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"लॉक स्क्रीन पर सूचनाएं"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"मैनेज करें कि किस तरह और कौनसी सूचनाएं दिखें"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"लॉक स्क्रीन से जुड़ी अन्य सेटिंग"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"निजता सेटिंग, \'अभी चल रहा है\' से जुड़ी सेटिंग, और अन्य सेटिंग"</string>
     <string name="more_colors" msgid="3191071655353004591">"कुछ और रंग"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f794925..8d04cd9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Boja"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Crvena"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Narančasta"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Žuta"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ništa"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Prikaži obavijesti na zaključanom zaslonu"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Obavijesti na zaključanom zaslonu"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Upravljajte načinom prikaza obavijesti i što će se prikazati"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Više postavki zaključanog zaslona"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privatnost, Upravo svira i drugo"</string>
     <string name="more_colors" msgid="3191071655353004591">"Više boja"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 715391d..e481a0a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stílus"</string>
     <string name="clock_color" msgid="8081608867289156163">"Szín"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Piros"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Narancssárga"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Sárga"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Nincs"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Értesítések megjelenítése a lezárási képernyőn"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Értesítések a lezárási képernyőn"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Értesítések megjelenítésének és a megjelenített elemek kezelése"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Több lezárásiképernyő-beállítás"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Adatvédelem, Now Playing és egyebek"</string>
     <string name="more_colors" msgid="3191071655353004591">"További színek"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 12de68c..489e08c 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Ոճ"</string>
     <string name="clock_color" msgid="8081608867289156163">"Գույն"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Կարմիր"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Նարնջագույն"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Դեղին"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ընտրված չէ"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Ցուցադրել ծանուցումները կողպէկրանին"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Ծանուցումներ կողպէկրանին"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Նշեք, թե ինչպես պետք է ծանուցումները հայտնվեն և թե ինչ ցուցադրել"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Կողպման այլ կարգավորումներ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Գաղտնիություն, «Այժմ հնչում է» և ավելին"</string>
     <string name="more_colors" msgid="3191071655353004591">"Այլ գույներ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2a168ca..78c6186 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Gaya"</string>
     <string name="clock_color" msgid="8081608867289156163">"Warna"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Merah"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranye"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Kuning"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Tidak ada"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Tampilkan notifikasi di layar kunci"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifikasi di layar kunci"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Kelola tampilan notifikasi dan informasi yang ditampilkan"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Setelan layar kunci lainnya"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privasi, Now Playing, dan lain-lain"</string>
     <string name="more_colors" msgid="3191071655353004591">"Warna lain"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c81fd3c..e47fd10 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stíll"</string>
     <string name="clock_color" msgid="8081608867289156163">"Litur"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rauður"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Appelsínugulur"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Gulur"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ekkert"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Sýna tilkynningar á lásskjánum"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Tilkynningar á lásskjá"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Stjórnaðu því hvernig tilkynningar birtast og hvað þær sýna"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Fleiri stillingar lásskjás"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Persónuvernd, í spilun og fleira"</string>
     <string name="more_colors" msgid="3191071655353004591">"Fleiri litir"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8bd69e8..250e79a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stile"</string>
     <string name="clock_color" msgid="8081608867289156163">"Colore"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rosso"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Arancione"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Giallo"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Nessuna"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostra le notifiche sulla schermata di blocco"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notifiche schermata di blocco"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Scegli come visualizzare le notifiche e ciò che devono mostrare"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Altre impostazioni della schermata di blocco"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Now Playing e altro"</string>
     <string name="more_colors" msgid="3191071655353004591">"Altri colori"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 27f2f31..fd58c47 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"סגנון"</string>
     <string name="clock_color" msgid="8081608867289156163">"צבע"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"אדום"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"כתום"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"צהוב"</string>
@@ -50,7 +54,7 @@
     <string name="shape_and_grid_title" msgid="9092477491363761054">"הצורה והפריסה של האפליקציה"</string>
     <string name="grid_layout" msgid="370175667652663686">"פריסה"</string>
     <string name="apply_theme_btn" msgid="6293081192321303991">"אישור"</string>
-    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"יש להקיש כדי לערוך"</string>
+    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"יש ללחוץ כדי לערוך"</string>
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"שמירת הטפט הנוכחי"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"תצוגה מקדימה של הסגנון"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"תצוגה מקדימה של הרשת"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"אין"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"הצגת ההתראות במסך הנעילה"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ההתראות במסך הנעילה"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"עריכת הגדרות התצוגה של התראות והמידע שיוצג בהן"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"עוד הגדרות של מסך הנעילה"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"פרטיות, \'מה שומעים עכשיו?\' ועוד"</string>
     <string name="more_colors" msgid="3191071655353004591">"צבעים נוספים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ec82ae4..efef4a0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>、<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"スタイル"</string>
     <string name="clock_color" msgid="8081608867289156163">"色"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"赤"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"オレンジ"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"黄"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>、<xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"なし"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"ロック画面に通知を表示する"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ロック画面上の通知"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"通知の表示方法と表示内容を管理します"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ロック画面のその他の設定"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"プライバシー、この曲なに？、その他"</string>
     <string name="more_colors" msgid="3191071655353004591">"他の色"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 4f5e745..341d692 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"სტილი"</string>
     <string name="clock_color" msgid="8081608867289156163">"ფერი"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"წითელი"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ნარინჯისფერი"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"ყვითელი"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"არცერთი"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"შეტყობინებების ჩვენება ჩაკეტილ ეკრანზე"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"შეტყობინებები ჩაკეტილ ეკრანზე"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"ეკრანზე ჩვენებისა და შეტყობინებების გამოჩენის წესის მართვა"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ჩაკეტილი ეკრანის მეტი პარამეტრი"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"კონფიდენციალურობა, რა უკრავს და სხვა"</string>
     <string name="more_colors" msgid="3191071655353004591">"მეტი ფერი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 46449c7..3f21e82 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стиль"</string>
     <string name="clock_color" msgid="8081608867289156163">"Түс"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Сағаттың түсі"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Тұсқағаз тақырыбын сәйкестендіріңіз не түс таңдаңыз."</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Қызыл"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Қызғылт сары"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Сары"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ешқандай"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Құлып экранында хабарландыруларды көрсету"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Құлып экранындағы хабарландыру"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Хабарландырулардың қалай және не көрсететінін басқарыңыз."</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Басқа құлып экраны параметрлері"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Құпиялық, Now Playing және басқа функциялар"</string>
     <string name="more_colors" msgid="3191071655353004591">"Қосымша түстер"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 82c3378..d1d1238 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"រចនាបថ"</string>
     <string name="clock_color" msgid="8081608867289156163">"ពណ៌"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ក្រហម"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ទឹកក្រូច"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"លឿង"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"គ្មាន"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"បង្ហាញការជូនដំណឹងនៅលើអេក្រង់ចាក់សោ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ការជូនដំណឹង​នៅលើ​អេក្រង់ចាក់សោ"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"គ្រប់គ្រងរបៀបដែលការជូនដំណឹងបង្ហាញ និងអ្វីដែលត្រូវបង្ហាញ"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ការ​កំណត់អេក្រង់ចាក់សោច្រើនទៀត"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ឯកជនភាព, Now Playing និងអ្វីៗច្រើនទៀត"</string>
     <string name="more_colors" msgid="3191071655353004591">"ពណ៌​ច្រើនទៀត"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index e88a587..93bf385 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ಶೈಲಿ"</string>
     <string name="clock_color" msgid="8081608867289156163">"ಬಣ್ಣ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ಕೆಂಪು"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ಕಿತ್ತಳೆ"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"ಹಳದಿ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ಯಾವುದೂ ಅಲ್ಲ"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ಲಾಕ್‌ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ನೋಟಿಫಿಕೇಶನ್"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"ನೋಟಿಫಿಕೇಶನ್‌ ಹೇಗೆ ಕಾಣಿಸಬೇಕು, ಏನು ತೋರಿಸಬೇಕು ಎಂಬುದನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ಇನ್ನಷ್ಟು ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ಗೌಪ್ಯತೆ, Now Playing ಮತ್ತು ಇನ್ನಷ್ಟು"</string>
     <string name="more_colors" msgid="3191071655353004591">"ಇನ್ನಷ್ಟು ಬಣ್ಣಗಳು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c1d3398..eec758a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"스타일"</string>
     <string name="clock_color" msgid="8081608867289156163">"색상"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"빨간색"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"주황색"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"노란색"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"없음"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"잠금 화면에 알림 표시"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"잠금 화면에 표시할 알림"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"알림 표시 방식 및 표시할 항목 관리"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"잠금 화면 설정 더보기"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"개인 정보 보호, Now Playing 등"</string>
     <string name="more_colors" msgid="3191071655353004591">"색상 더보기"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 44f0b17..2677530 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стиль"</string>
     <string name="clock_color" msgid="8081608867289156163">"Түс"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"КЫЗЫЛ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"КЫЗГЫЛТ САРЫ"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"САРЫ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Жок"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Билдирмелерди кулпуланган экранда көрсөтүү"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Кулпу экранындагы билдирмелер"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Билдирмелердин көрүнүшүн жана эмнелерди көрсөтүүнү тескеңиз"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Дагы кулпу экран параметрлери"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Купуялык, Эмне ойноп жатат? жана башкалар"</string>
     <string name="more_colors" msgid="3191071655353004591">"Дагы түстөр"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 01924fc..da7fbe6 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ຮູບແບບ"</string>
     <string name="clock_color" msgid="8081608867289156163">"ສີ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ສີແດງ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ສີສົ້ມ"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"ສີເຫຼືອງ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ບໍ່ມີ"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"ສະແດງການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"ຈັດການລັກສະນະທີ່ການແຈ້ງເຕືອນຈະປາກົດ ແລະ ສິ່ງທີ່ຄວນສະແດງ"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ການຕັ້ງຄ່າໜ້າຈໍລັອກເພີ່ມເຕີມ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ຄວາມເປັນສ່ວນຕົວ, Now Playing ແລະ ອື່ນໆ"</string>
     <string name="more_colors" msgid="3191071655353004591">"ສີເພີ່ມເຕີມ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7552d1c..0b4c992 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stilius"</string>
     <string name="clock_color" msgid="8081608867289156163">"Spalva"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Laikrodžio spalva"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Derinkite spalvą prie ekrano fono temos arba pasirinkite savo spalvą"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Raudona"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranžinė"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Geltona"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Nėra"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Rodyti pranešimus užrakinimo ekrane"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Pranešimai užrakinimo ekrane"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Tvarkykite, kaip rodomi pranešimai ir ką rodyti"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Dar užrakinimo ekrano nustatymų"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privatumas, „Dabar leidžiama“ ir kt."</string>
     <string name="more_colors" msgid="3191071655353004591">"Daugiau spalvų"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 27e6883..593e6ef 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stils"</string>
     <string name="clock_color" msgid="8081608867289156163">"Krāsa"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Sarkana"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranža"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Dzeltena"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Nav"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Rādīt paziņojumus bloķēšanas ekrānā"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Paziņojumi bloķēšanas ekrānā"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Pārvaldiet, kā tiek rādīti paziņojumi un kādi paziņojumi jārāda."</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Citas bloķēšanas ekrāna iespējas"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Konfidencialitāte, funkcija “Tagad atskaņo” un citi iestatījumi"</string>
     <string name="more_colors" msgid="3191071655353004591">"Citas krāsas"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 5e78578..6c32e46 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стил"</string>
     <string name="clock_color" msgid="8081608867289156163">"Боја"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Црвена"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Портокалова"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Жолта"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Нема"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Прикажувај известувања на заклучен екран"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Известувања на заклучен екран"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Управувајте со тоа како и кои известувања се појавуваат"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Уште поставки за заклучен екран"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Приватност, Now Playing и друго"</string>
     <string name="more_colors" msgid="3191071655353004591">"Повеќе бои"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index e8a222a..48adde9 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"സ്റ്റൈൽ"</string>
     <string name="clock_color" msgid="8081608867289156163">"നിറം"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ചുവപ്പ്"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ഓറഞ്ച്"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"മഞ്ഞ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ഒന്നുമില്ല"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"ലോക്ക് സ്ക്രീനിൽ അറിയിപ്പുകൾ കാണിക്കുക"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ലോക്ക് സ്ക്രീനിലെ അറിയിപ്പുകൾ"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"അറിയിപ്പുകൾ ദൃശ്യമാകുന്ന രീതിയും കാണിക്കേണ്ടവയും മാനേജ് ചെയ്യുക"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"കൂടുതൽ ലോക്ക്‌സ്ക്രീൻ ക്രമീകരണം"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"സ്വകാര്യത, ഇപ്പോൾ കേൾക്കുന്നത്, എന്നിവയും മറ്റും"</string>
     <string name="more_colors" msgid="3191071655353004591">"കൂടുതൽ നിറങ്ങൾ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 0fc508a..012b471 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Загвар"</string>
     <string name="clock_color" msgid="8081608867289156163">"Өнгө"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Улаан"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Улбар шар"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Шар"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Байхгүй"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Түгжээтэй дэлгэц дээр мэдэгдэл харуулах"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Түгжээтэй дэлгэц дээрх мэдэгдэл"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Мэдэгдэл хэрхэн харагдах болон юу харуулахыг удирдана уу"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Түгжээтэй дэлгэцийн өөр тохиргоо"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Нууцлал, Now Playing болон бусад"</string>
     <string name="more_colors" msgid="3191071655353004591">"Бусад өнгө"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7939c28..89397c2 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"शैली"</string>
     <string name="clock_color" msgid="8081608867289156163">"रंग"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Clock चा रंग"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"वॉलपेपर थीमशी जुळवा आणि तुमचा स्वतःचा रंग निवडा"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"लाल"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"नारिंगी"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"पिवळा"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"काहीही नाही"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"लॉक स्‍क्रीनवर सूचना दाखवा"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"लॉक स्क्रीनवरील नोटिफिकेशन"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"नोटिफिकेशन कशी दिसतात आणि काय दाखवावे हे व्यवस्थापित करा"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"आणखी लॉक स्‍क्रीन सेटिंग्ज"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"गोपनीयता, Now Playing आणि आणखी बरेच काही"</string>
     <string name="more_colors" msgid="3191071655353004591">"आणखी रंग"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 36e81b6..3733837 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Gaya"</string>
     <string name="clock_color" msgid="8081608867289156163">"Warna"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Warna jam"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Padankan tema hiasan latar atau pilih warna anda"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Merah"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Jingga"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Kuning"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Tiada"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Tunjukkan pemberitahuan pada skrin kunci"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Pemberitahuan pada skrin kunci"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Urus cara pemberitahuan dipaparkan dan perkara untuk ditunjukkan"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Lagi tetapan skrin kunci"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privasi, Now Playing dan pelbagai lagi"</string>
     <string name="more_colors" msgid="3191071655353004591">"Lagi Warna"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index ef0a9dc..d1ce93b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>၊ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ပုံစံ"</string>
     <string name="clock_color" msgid="8081608867289156163">"အရောင်"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"အနီရောင်"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"လိမ္မော်ရောင်"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"အဝါရောင်"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>၊ <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"မရှိ"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"အကြောင်းကြားချက်များကို လော့ခ်မျက်နှာပြင်တွင် ပြပါ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"လော့ခ်မျက်နှာပြင်ရှိ အကြောင်းကြားချက်"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"အကြောင်းကြားချက်များ မြင်ရပုံနှင့် ပြမည့်အရာများကို စီမံနိုင်သည်"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"နောက်ထပ်လော့ခ်မျက်နှာပြင် ဆက်တင်များ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ကိုယ်ရေးအချက်အလက်လုံခြုံမှု၊ Now Playing နှင့်အခြား"</string>
     <string name="more_colors" msgid="3191071655353004591">"နောက်ထပ်အရောင်များ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5a8dedf..ec7ffd1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Farge"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rød"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oransje"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Gul"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ingen"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Vis varsler på låseskjermen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Varsler på låseskjermen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Administrer hvordan varsler vises, og hva som skal vises"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Flere låseskjerminnstillinger"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Personvern, Spilles nå med mer"</string>
     <string name="more_colors" msgid="3191071655353004591">"Flere farger"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index a5884b2..a8be134 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"शैली"</string>
     <string name="clock_color" msgid="8081608867289156163">"रङ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"रातो"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"सुन्तले"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"पहेँलो"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"कुनै पनि होइन"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"लक स्क्रिनमा सूचनाहरू देखाउनुहोस्"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"लक स्क्रिनमा देखाइने नोटिफिकेसनहरू"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"नोटिफिकेसन कसरी देखिन्छ र नोटिफिकेसनमा के के देखाउने भन्ने कुरा व्यवस्थापन गर्नुहोस्"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"लक स्क्रिनसम्बन्धी थप सेटिङ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"गोपनीयता, Now Playing र अन्य कुराहरू"</string>
     <string name="more_colors" msgid="3191071655353004591">"थप रङहरू"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b7a646f..14c572e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stijl"</string>
     <string name="clock_color" msgid="8081608867289156163">"Kleur"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rood"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranje"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Geel"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Geen"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Meldingen tonen op het vergrendelscherm"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Meldingen op vergrendelscherm"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Beheer hoe meldingen worden getoond en wat er wordt getoond"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Meer instellingen voor vergrendelscherm"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Now Playing en meer"</string>
     <string name="more_colors" msgid="3191071655353004591">"Meer kleuren"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a1ca18d..5fcc600 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ଷ୍ଟାଇଲ"</string>
     <string name="clock_color" msgid="8081608867289156163">"ରଙ୍ଗ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ଲାଲ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"କମଳା"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"ହଳଦିଆ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"କିଛି ନାହିଁ"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"ଲକ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ଲକ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତି"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ କିପରି ଦେଖାଯିବ ଏବଂ କଣ ଦେଖାଇବ ତାହା ପରିଚାଳନା କରନ୍ତୁ"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ଅଧିକ ଲକ ସ୍କ୍ରିନ ସେଟିଂସ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ଗୋପନୀୟତା, ବର୍ତ୍ତମାନ ପ୍ଲେ ହେଉଛି ଏବଂ ଆହୁରି ଅନେକ କିଛି"</string>
     <string name="more_colors" msgid="3191071655353004591">"ଅଧିକ ରଙ୍ଗ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 993448e..a06da55 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ਸਟਾਈਲ"</string>
     <string name="clock_color" msgid="8081608867289156163">"ਰੰਗ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"ਲਾਲ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ਸੰਤਰੀ"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"ਪੀਲਾ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"ਇਹ ਪ੍ਰਬੰਧਨ ਕਰੋ ਕਿ ਕਿਵੇਂ ਅਤੇ ਕਿਹੜੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਣ"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"ਹੋਰ ਲਾਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ਪਰਦੇਦਾਰੀ, Now Playing ਅਤੇ ਹੋਰ"</string>
     <string name="more_colors" msgid="3191071655353004591">"ਹੋਰ ਰੰਗ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1f928be..7c1440c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Styl"</string>
     <string name="clock_color" msgid="8081608867289156163">"Kolor"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Kolor zegara"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Dopasuj do tapety lub wybierz własny kolor"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Czerwony"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Pomarańczowy"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Żółty"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Brak"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Pokazuj powiadomienia na ekranie blokady"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Powiadomienia na ekranie blokady"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Zarządzaj wyświetlaniem i zawartością powiadomień"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Więcej ustawień ekranu blokady"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Prywatność, Co jest grane i inne ustawienia"</string>
     <string name="more_colors" msgid="3191071655353004591">"Więcej kolorów"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0d253dc..3af506a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estilo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Cor"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Cor do relógio"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Combine com o tema da imagem de fundo ou escolha a cor"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Vermelho"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Laranja"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Amarelo"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Nenhum"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostrar as notificações no ecrã de bloqueio"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notificações no ecrã de bloqueio"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Faça a gestão do conteúdo e da apresentação das notificações"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Mais defin. do ecrã de bloqueio"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacidade, A reproduzir e muito mais"</string>
     <string name="more_colors" msgid="3191071655353004591">"Mais cores"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index fec2642..c316d71 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Estilo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Cor"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Cor do relógio"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Combinar com o tema do plano de fundo ou escolher a cor"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Vermelho"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Laranja"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Amarelo"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Nenhum"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostrar notificações na tela de bloqueio"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notificações na tela de bloqueio"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Gerencie como as notificações aparecem e o que mostrar"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Mais configurações da tela de bloqueio"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacidade, Tocando agora e muito mais"</string>
     <string name="more_colors" msgid="3191071655353004591">"Mais cores"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 97adbce..20e7a67 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Culoare"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Roșu"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Portocaliu"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Galben"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Niciunul"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Afișează notificările pe ecranul de blocare"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notificări pe ecranul de blocare"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Gestionează modul în care apar notificările și ce se afișează"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Alte setări de ecran de blocare"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Confidențialitate, Now Playing și altele"</string>
     <string name="more_colors" msgid="3191071655353004591">"Mai multe culori"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ab23bb7..1d358ae 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>."</string>
     <string name="clock_style" msgid="6847711178193804308">"Стиль"</string>
     <string name="clock_color" msgid="8081608867289156163">"Цвет"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Красный"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Оранжевый"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Желтый"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Нет"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Показывать уведомления на заблокированном экране"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Уведомления на заблок. экране"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Настройте внешний вид и содержание уведомлений"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Ещё настройки блокировки экрана"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Конфиденциальность, функция \"Что сейчас играет?\" и т. д."</string>
     <string name="more_colors" msgid="3191071655353004591">"Ещё цвета"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 2f103ee..f99c6c2 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"විලාසය"</string>
     <string name="clock_color" msgid="8081608867289156163">"වර්ණය"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"රතු"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"තැඹිලි"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"කහ"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"කිසිවක් නැත"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"අගුළු තිරය මත දැනුම්දීම් පෙන්වන්න"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"අගුලු තිරයෙහි දැනුම් දීම්"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"දැනුම්දීම් දිස් වන ආකාරය සහ පෙන්විය යුතු දේ කළමනාකරණය කරන්න"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"තවත් අගුළු තිර සැකසීම්"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"පෞද්ගලිකත්වය, Now Playing, සහ තවත් දේ"</string>
     <string name="more_colors" msgid="3191071655353004591">"තවත් වර්ණ"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0e8b3b3..41ac435 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Štýl"</string>
     <string name="clock_color" msgid="8081608867289156163">"Farba"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Červená"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranžová"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Žltá"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Žiadne"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Zobrazovať upozornenia na uzamknutej obrazovke"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Upozornenia na uzamk. obrazovke"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Spravujte, ako sa upozornenia zobrazujú a čo zobrazujú"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Ďalšie nastav. uzamk. obrazovky"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Ochrana súkromia, Čo to hrá a ďalšie funkcie"</string>
     <string name="more_colors" msgid="3191071655353004591">"Ďalšie farby"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3c0f8d5..53bbbe1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Slog"</string>
     <string name="clock_color" msgid="8081608867289156163">"Barva"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Rdeča"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Oranžna"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Rumena"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Brez"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Prikaži obvestila na zaklenjenem zaslonu"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Obvestila na zaklenjenem zaslonu"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Upravljajte način prikaza obvestil in kaj se prikaže"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Nastavitve zaklenjenega zaslona"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Zasebnost, Zdaj se predvaja in drugo"</string>
     <string name="more_colors" msgid="3191071655353004591">"Več barv"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 152be94..b40bcd7 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stili"</string>
     <string name="clock_color" msgid="8081608867289156163">"Ngjyra"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"E kuqe"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Portokalli"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"E verdhë"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Asnjë"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Shfaq njoftimet në ekranin e kyçjes"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Njoftimet në ekranin e kyçjes"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Menaxho se si shfaqen njoftimet dhe çfarë të shfaqësh"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Cilësime të ekranit të kyçjes"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privatësia, \"Gjej këngën\" etj."</string>
     <string name="more_colors" msgid="3191071655353004591">"Më shumë ngjyra"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index bb7211f..0f789f4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стил"</string>
     <string name="clock_color" msgid="8081608867289156163">"Боја"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Црвена"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Наранџаста"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Жута"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Ништа"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Приказуј обавештења на закључаном екрану"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Обавештења на закључаном екрану"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Управљајте приказом обавештења и садржајем приказа"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Још подешавања закључаног екрана"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Приватност, Тренутно свира и друго"</string>
     <string name="more_colors" msgid="3191071655353004591">"Још боја"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 40969a0..91b0b72 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Färg"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Röd"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Gul"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Inga"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Visa aviseringar på låsskärmen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Aviseringar på låsskärmen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Hantera hur aviseringar visas och vad som ska visas"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Fler inställningar för låsskärm"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Integritet, Nu spelas med mera"</string>
     <string name="more_colors" msgid="3191071655353004591">"Fler färger"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1d377bf..2fbd385 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Muundo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Rangi"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Nyekundu"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Rangi ya chungwa"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Njano"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Hamna"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Onyesha arifa kwenye skrini iliyofungwa"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Arifa kwenye skrini iliyofungwa"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Dhibiti jinsi arifa zinavyoonekana na maelezo ya kuonyesha"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Mipangilio zaidi ya skrini iliyofungwa"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Faragha, Kitambua Ngoma na zaidi"</string>
     <string name="more_colors" msgid="3191071655353004591">"Rangi Zaidi"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 5e13ee8..286eaea 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"ஸ்டைல்"</string>
     <string name="clock_color" msgid="8081608867289156163">"நிறம்"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"சிவப்பு"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ஆரஞ்சு"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"மஞ்சள்"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ஏதுமில்லை"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"பூட்டுத் திரையில் அறிவிப்புகளைக் காட்டு"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"பூட்டுத் திரையில் அறிவிப்புகள்"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"அறிவிப்புகள் தோன்றும் விதம் &amp; காட்ட வேண்டியவற்றை நிர்வகிக்கலாம்"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"கூடுதல் பூட்டுத் திரை அமைப்புகள்"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"தனியுரிமை, பாடல் விவரம் மற்றும் பல"</string>
     <string name="more_colors" msgid="3191071655353004591">"கூடுதல் வண்ணங்கள்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 8d9365a..7b9c059 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"స్టయిల్"</string>
     <string name="clock_color" msgid="8081608867289156163">"రంగు"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"గడియారం రంగు"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"వాల్‌పేపర్ థీమ్‌కు సరిపోయే లేదా స్వంత రంగును ఎంచుకోండి"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"ఎరుపు రంగు"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"నారింజ రంగు"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"పసుపు రంగు"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ఏదీ ఎంచుకోలేదు"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"లాక్ స్క్రీన్‌లో నోటిఫికేషన్‌లను చూపండి"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"లాక్‌స్క్రీన్‌లో నోటిఫికేషన్‌లు"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"నోటిఫికేషన్‌లు ఎలా కనిపించాలి, ఎలాంటివి చూపాలో మేనేజ్ చేయండి"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"మరిన్ని లాక్ స్క్రీన్ సెట్టింగ్‌లు"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"గోప్యత, Now Playing, ఇంకా మరిన్ని"</string>
     <string name="more_colors" msgid="3191071655353004591">"మరిన్ని రంగులు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index af280f6..f7b0dc3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"รูปแบบ"</string>
     <string name="clock_color" msgid="8081608867289156163">"สี"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"แดง"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"ส้ม"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"เหลือง"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"ไม่มี"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"แสดงการแจ้งเตือนบนหน้าจอล็อก"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"การแจ้งเตือนบนหน้าจอล็อก"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"จัดการลักษณะที่การแจ้งเตือนจะปรากฏและสิ่งที่ควรแสดง"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"การตั้งค่าหน้าจอล็อกเพิ่มเติม"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"ความเป็นส่วนตัว ฟีเจอร์ \"กำลังเล่น\" และอื่นๆ"</string>
     <string name="more_colors" msgid="3191071655353004591">"สีเพิ่มเติม"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 96b5c16..2fa4e18 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Istilo"</string>
     <string name="clock_color" msgid="8081608867289156163">"Kulay"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Pula"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Orange"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Dilaw"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Wala"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Ipakita ang mga notification sa lock screen"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Mga notification sa lock screen"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Pamahalaan kung paano lalabas ang notifications at ang ipapakita"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Higit pang lock screen setting"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Privacy, Nagpe-play Ngayon, at higit pa"</string>
     <string name="more_colors" msgid="3191071655353004591">"Higit Pang Kulay"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 130ef01..59d9852 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Stil"</string>
     <string name="clock_color" msgid="8081608867289156163">"Renk"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Kırmızı"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Turuncu"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Sarı"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Yok"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Kilit ekranında bildirimleri göster"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Kilit ekranındaki bildirimler"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Bildirimlerin nasıl görüneceğini ve nelerin gösterileceğini yönetin"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Diğer kilit ekranı ayarları"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Gizlilik, Ne Çalıyor? ve daha fazlası"</string>
     <string name="more_colors" msgid="3191071655353004591">"Diğer Renkler"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ab239e0..55067b1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Стиль"</string>
     <string name="clock_color" msgid="8081608867289156163">"Колір"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Червоний"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Оранжевий"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Жовтий"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Немає"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Показувати сповіщення на заблокованому екрані"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Сповіщення на заблоков. екрані"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Керуйте виглядом і вмістом сповіщень"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Інші налаштув. заблоков. екрана"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Конфіденційність, функція \"Зараз грає\" тощо"</string>
     <string name="more_colors" msgid="3191071655353004591">"Більше кольорів"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 617d280..70e61c9 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>، <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"اسٹائل"</string>
     <string name="clock_color" msgid="8081608867289156163">"رنگ"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"سرخ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"نارنجی"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"زرد"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>، <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"کوئی نہیں"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"مقفل اسکرین پر اطلاعات دکھائیں"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"لاک اسکرین پر اطلاعات"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"نظم کریں کہ اطلاعات کیسے ظاہر ہوں اور کیا دکھانا ہے"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"مقفل اسکرین کی مزید ترتیبات"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"رازداری، Now Playing اور مزید"</string>
     <string name="more_colors" msgid="3191071655353004591">"مزید رنگ"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index fdd4378..5d9fc6b 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -28,6 +28,8 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Uslub"</string>
     <string name="clock_color" msgid="8081608867289156163">"Rang"</string>
+    <string name="clock_color_title" msgid="4484141281632973058">"Soat rangi"</string>
+    <string name="clock_color_description" msgid="1493964392794026841">"Fon mavzusini moslash yoki oʻz rangingizni tanlash"</string>
     <string name="clock_color_red" msgid="3843504214807597810">"Qizil"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Toʻq sariq"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Sariq"</string>
@@ -142,10 +144,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Hech qanday"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Ekran qulfida bildirishnomalarni chiqarish"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Ekran qulfida bildirishnomalar"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Bildirishnomalar qanday chiqishi va nima chiqarishini boshqarish"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Boshqa ekran qulfi sozlamalari"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Maxfiylik, Bu qaysi musiqa va boshqalar"</string>
     <string name="more_colors" msgid="3191071655353004591">"Boshqa ranglar"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 711fcce..0e3eeeb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Kiểu"</string>
     <string name="clock_color" msgid="8081608867289156163">"Màu"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Đỏ"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Cam"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Vàng"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Không có"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Hiện thông báo trên màn hình khoá"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Thông báo trên màn hình khoá"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Quản lý cách thông báo xuất hiện và nội dung hiển thị"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Cài đặt khác trên màn hình khoá"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Quyền riêng tư, Phát hiện nhạc, v.v."</string>
     <string name="more_colors" msgid="3191071655353004591">"Màu khác"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5eecf51..0e83991 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>、<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"样式"</string>
     <string name="clock_color" msgid="8081608867289156163">"颜色"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"红色"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"橙色"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"黄色"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>、<xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"无"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"在锁定的屏幕上显示通知"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"锁定屏幕上的通知"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"管理通知的显示方式和显示内容"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"更多锁屏设置"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"隐私设置、闻曲知音等"</string>
     <string name="more_colors" msgid="3191071655353004591">"更多颜色"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 6f5a962..c54fb3a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>，<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"樣式"</string>
     <string name="clock_color" msgid="8081608867289156163">"顏色"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"紅色"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"橙色"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"黃色"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>，<xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"無"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"在上鎖畫面顯示通知"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"上鎖畫面上的通知"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"管理通知的顯示方式和內容"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"更多上鎖畫面設定"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"私隱、歌曲識別和其他設定"</string>
     <string name="more_colors" msgid="3191071655353004591">"更多顏色"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2b555b8..68b5ad5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_2">%2$s</xliff:g>，<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"樣式"</string>
     <string name="clock_color" msgid="8081608867289156163">"顏色"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"紅色"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"橘色"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"黃色"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>、<xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"無"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"在螢幕鎖定畫面上顯示通知"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"螢幕鎖定畫面通知"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"管理通知的顯示方式和內容"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"更多螢幕鎖定設定"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"隱私權、聽聲辨曲和其他設定"</string>
     <string name="more_colors" msgid="3191071655353004591">"更多顏色"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ab37ae3..c34ba2f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -28,6 +28,10 @@
     <string name="clock_color_and_size_description" msgid="6578061553012886817">"<xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="clock_style" msgid="6847711178193804308">"Isitayela"</string>
     <string name="clock_color" msgid="8081608867289156163">"Umbala"</string>
+    <!-- no translation found for clock_color_title (4484141281632973058) -->
+    <skip />
+    <!-- no translation found for clock_color_description (1493964392794026841) -->
+    <skip />
     <string name="clock_color_red" msgid="3843504214807597810">"Okubomvu"</string>
     <string name="clock_color_orange" msgid="4175805201144275804">"Okuwolintshi"</string>
     <string name="clock_color_yellow" msgid="7391699163247349977">"Okuphuzi"</string>
@@ -142,10 +146,8 @@
     <string name="keyguard_quick_affordance_two_selected_template" msgid="1757099194522296363">"<xliff:g id="FIRST">%1$s</xliff:g>, <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="keyguard_quick_affordance_none_selected" msgid="8494127020144112003">"Lutho"</string>
     <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Bonisa izaziso esikrinini sokukhiya"</string>
-    <!-- no translation found for lock_screen_notifications_section_title (906673283764252102) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_section_description (3321937285144466046) -->
-    <skip />
+    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Izaziso esikrinini sokukhiya"</string>
+    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Phatha ukuthi izaziso zisebenza kanjani nokuthi kumele ubonise ini"</string>
     <string name="more_settings_section_title" msgid="6854797937797818510">"Amasethingi okukhiya isikrini"</string>
     <string name="more_settings_section_description" msgid="1860115709122398325">"Ubumfihlo, Okudlala Manje, nokuningi"</string>
     <string name="more_colors" msgid="3191071655353004591">"Imibala Eyengeziwe"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8fdc97e..f62a6ad 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -204,6 +204,9 @@
     <!--Title for a grid option, describing the number of columns and rows, eg: 4x4 [CHAR LIMIT=10] -->
     <string name="grid_title_pattern"><xliff:g name="num_cols" example="1">%1$d</xliff:g>x<xliff:g name="num_rows" example="1">%2$d</xliff:g></string>
 
+    <!--Copntent description for a grid option, describing the number of columns and rows, eg: 4 by 4 [CHAR LIMIT=10] -->
+    <string name="grid_content_description"><xliff:g name="num_cols" example="1">%1$d</xliff:g> by <xliff:g name="num_rows" example="1">%2$d</xliff:g></string>
+
     <!-- Label of what will happen when user tap on apply button to change grid. [CHAR LIMIT=50] -->
     <string name="apply_grid_btn_note">Changing grid size will reload workspace and may take a few seconds.</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fc2fd8a..821cbf7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -120,7 +120,7 @@
         <item name="android:textColor">@color/system_on_surface</item>
         <item name="android:textDirection">locale</item>
         <item name="android:textSize">20sp</item>
-        <item name="android:lineHeight">24dp</item>
+        <item name="android:lineHeight">24sp</item>
     </style>
 
     <style name="SectionSubtitleTextStyle" parent="SectionTitleTextStyle">
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index 74da5c2..ef5e3d6 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -120,15 +120,15 @@
             loaderJob?.join()
             if (presetColorBundles == null || reload) {
                 try {
-                    loaderJob = launch { loadPreset() }
+                    loaderJob = launch { loadPreset(isNewPickerUi) }
                 } catch (e: Throwable) {
                     colorsAvailable = false
                     callback?.onError(e)
                     return@launch
                 }
-                callback?.onOptionsLoaded(buildFinalList())
+                callback?.onOptionsLoaded(buildFinalList(isNewPickerUi))
             } else {
-                callback?.onOptionsLoaded(buildFinalList())
+                callback?.onOptionsLoaded(buildFinalList(isNewPickerUi))
             }
         }
     }
@@ -236,8 +236,8 @@
     }
 
     /**
-     * Returns the light theme version of the Revamped UI preview of a ColorScheme based on this
-     * order: top left, top right, bottom left, bottom right
+     * Returns the light theme preview of a dynamic ColorScheme based on this order: top left, top
+     * right, bottom left, bottom right
      *
      * This color mapping corresponds to GM3 colors: Primary (light), Primary (light), Secondary
      * LStar 85, and Tertiary LStar 70
@@ -253,8 +253,8 @@
     }
 
     /**
-     * Returns the dark theme version of the Revamped UI preview of a ColorScheme based on this
-     * order: top left, top right, bottom left, bottom right
+     * Returns the dark theme preview of a dynamic ColorScheme based on this order: top left, top
+     * right, bottom left, bottom right
      *
      * This color mapping corresponds to GM3 colors: Primary (dark), Primary (dark), Secondary LStar
      * 35, and Tertiary LStar 70
@@ -270,8 +270,8 @@
     }
 
     /**
-     * Returns the light theme version of the Revamped UI preview of a ColorScheme based on this
-     * order: top left, top right, bottom left, bottom right
+     * Returns the light theme preview of a monochrome ColorScheme based on this order: top left,
+     * top right, bottom left, bottom right
      *
      * This color mapping corresponds to GM3 colors: Primary LStar 0, Primary LStar 0, Secondary
      * LStar 85, and Tertiary LStar 70
@@ -287,8 +287,8 @@
     }
 
     /**
-     * Returns the dark theme version of the Revamped UI preview of a ColorScheme based on this
-     * order: top left, top right, bottom left, bottom right
+     * Returns the dark theme preview of a monochrome ColorScheme based on this order: top left, top
+     * right, bottom left, bottom right
      *
      * This color mapping corresponds to GM3 colors: Primary LStar 99, Primary LStar 99, Secondary
      * LStar 35, and Tertiary LStar 70
@@ -304,13 +304,13 @@
     }
 
     /**
-     * Returns the Revamped UI preview of a preset ColorScheme based on this order: top left, top
-     * right, bottom left, bottom right
+     * Returns the preview of a preset ColorScheme based on this order: top left, top right, bottom
+     * left, bottom right
      */
-    private fun getPresetColorPreview(colorScheme: ColorScheme, seed: Int): IntArray {
+    private fun getFixedPresetColorPreview(colorScheme: ColorScheme): IntArray {
         val colors =
             when (colorScheme.style) {
-                Style.FRUIT_SALAD -> intArrayOf(seed, colorScheme.accent1.s200)
+                Style.FRUIT_SALAD -> intArrayOf(colorScheme.accent3.s100, colorScheme.accent1.s200)
                 Style.TONAL_SPOT -> intArrayOf(colorScheme.accentColor, colorScheme.accentColor)
                 Style.RAINBOW -> intArrayOf(colorScheme.accent1.s200, colorScheme.accent1.s200)
                 else -> intArrayOf(colorScheme.accent1.s100, colorScheme.accent1.s100)
@@ -318,7 +318,30 @@
         return intArrayOf(colors[0], colors[1], colors[0], colors[1])
     }
 
-    private suspend fun loadPreset() =
+    /**
+     * Returns the light theme contrast-adjusted preview of a preset ColorScheme, specifically for
+     * Revamped UI, based on this order: top left, top right, bottom left, bottom right
+     */
+    private fun getLightPresetColorPreview(colorScheme: ColorScheme): IntArray {
+        val colors =
+            when (colorScheme.style) {
+                Style.FRUIT_SALAD ->
+                    intArrayOf(
+                        colorScheme.accent3.getAtTone(450f),
+                        colorScheme.accent1.getAtTone(550f),
+                    )
+                Style.TONAL_SPOT -> intArrayOf(colorScheme.accentColor, colorScheme.accentColor)
+                Style.RAINBOW ->
+                    intArrayOf(
+                        colorScheme.accent1.getAtTone(450f),
+                        colorScheme.accent1.getAtTone(450f),
+                    )
+                else -> intArrayOf(colorScheme.accent1.s100, colorScheme.accent1.s100)
+            }
+        return intArrayOf(colors[0], colors[1], colors[0], colors[1])
+    }
+
+    private suspend fun loadPreset(isNewPickerUi: Boolean) =
         withContext(Dispatchers.IO) {
             val bundles: MutableList<ColorOption> = ArrayList()
 
@@ -358,9 +381,23 @@
                         hasMonochrome = true
                         monochromeBundleName = bundleName
                     }
-                    bundles.add(buildPreset(bundleName, index, style))
+                    bundles.add(
+                        buildPreset(
+                            bundleName = bundleName,
+                            index = index,
+                            style = style,
+                            isNewPickerUi = isNewPickerUi,
+                        )
+                    )
                 } else {
-                    bundles.add(buildPreset(bundleName, index, null))
+                    bundles.add(
+                        buildPreset(
+                            bundleName = bundleName,
+                            index = index,
+                            style = null,
+                            isNewPickerUi = isNewPickerUi,
+                        )
+                    )
                 }
 
                 index++
@@ -378,6 +415,7 @@
         index: Int,
         @Style.Type style: Int? = null,
         type: ColorType = ColorType.PRESET_COLOR,
+        isNewPickerUi: Boolean,
     ): ColorOptionImpl {
         val builder = ColorOptionImpl.Builder()
         builder.title = getItemStringFromStub(COLOR_BUNDLE_NAME_PREFIX, bundleName)
@@ -406,8 +444,13 @@
                     lightColors = getLightMonochromePreview(lightColorScheme)
                 }
                 else -> {
-                    darkColors = getPresetColorPreview(darkColorScheme, colorFromStub)
-                    lightColors = getPresetColorPreview(lightColorScheme, colorFromStub)
+                    darkColors = getFixedPresetColorPreview(darkColorScheme)
+                    lightColors =
+                        if (isNewPickerUi) {
+                            getFixedPresetColorPreview(lightColorScheme)
+                        } else {
+                            getLightPresetColorPreview(lightColorScheme)
+                        }
                 }
             }
         }
@@ -416,7 +459,7 @@
         return builder.build()
     }
 
-    private fun buildFinalList(): List<ColorOption> {
+    private fun buildFinalList(isNewPickerUi: Boolean): List<ColorOption> {
         val presetColors = presetColorBundles ?: emptyList()
         val wallpaperColors = wallpaperColorBundles?.toMutableList() ?: mutableListOf()
         // Insert monochrome in the second position if it is enabled and included in preset
@@ -426,7 +469,13 @@
                 if (wallpaperColors.isNotEmpty()) {
                     wallpaperColors.add(
                         1,
-                        buildPreset(it, -1, Style.MONOCHROMATIC, ColorType.WALLPAPER_COLOR),
+                        buildPreset(
+                            bundleName = it,
+                            index = -1,
+                            style = Style.MONOCHROMATIC,
+                            type = ColorType.WALLPAPER_COLOR,
+                            isNewPickerUi = isNewPickerUi,
+                        ),
                     )
                 }
             }
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
index 3adc913..88b7d39 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
@@ -66,7 +66,7 @@
                 optionContainer.paddingLeft,
                 16,
                 optionContainer.paddingRight,
-                16
+                16,
             )
         } else {
             moreColorsButton.isVisible = false
@@ -77,7 +77,7 @@
                 optionContainer.paddingLeft,
                 20,
                 optionContainer.paddingRight,
-                20
+                20,
             )
         }
         lifecycleOwner.lifecycleScope.launch {
@@ -129,11 +129,15 @@
                 )
             }
             val optionSelectedView = itemView.requireViewById<ImageView>(R.id.option_selected)
+            val colorView: View = itemView.requireViewById(R.id.option_tile)
+            colorView.isClickable = true
+            colorView.isFocusable = true
 
             lifecycleOwner.lifecycleScope.launch {
                 launch {
                     item.isSelected.collect { isSelected ->
                         optionSelectedView.isVisible = isSelected
+                        colorView.isSelected = isSelected
                     }
                 }
                 launch {
diff --git a/src/com/android/customization/picker/grid/ui/viewmodel/GridScreenViewModel.kt b/src/com/android/customization/picker/grid/ui/viewmodel/GridScreenViewModel.kt
index 179127d..201b21f 100644
--- a/src/com/android/customization/picker/grid/ui/viewmodel/GridScreenViewModel.kt
+++ b/src/com/android/customization/picker/grid/ui/viewmodel/GridScreenViewModel.kt
@@ -26,6 +26,7 @@
 import com.android.customization.model.ResourceConstants
 import com.android.customization.picker.grid.domain.interactor.GridInteractor
 import com.android.customization.picker.grid.shared.model.GridOptionItemsModel
+import com.android.themepicker.R
 import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
 import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel
 import kotlinx.coroutines.flow.Flow
@@ -34,10 +35,7 @@
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
-class GridScreenViewModel(
-    context: Context,
-    private val interactor: GridInteractor,
-) : ViewModel() {
+class GridScreenViewModel(context: Context, private val interactor: GridInteractor) : ViewModel() {
 
     @SuppressLint("StaticFieldLeak") // We're not leaking this context as it is the app context.
     private val applicationContext = context.applicationContext
@@ -46,7 +44,7 @@
         interactor.options.map { model -> toViewModel(model) }
 
     private fun toViewModel(
-        model: GridOptionItemsModel,
+        model: GridOptionItemsModel
     ): List<OptionItemViewModel<GridIconViewModel>> {
         val iconShapePath =
             applicationContext.resources.getString(
@@ -72,6 +70,14 @@
                                 path = iconShapePath,
                             ),
                         text = text,
+                        contentDescription =
+                            Text.Loaded(
+                                applicationContext.resources.getString(
+                                    R.string.grid_content_description,
+                                    option.cols,
+                                    option.rows,
+                                )
+                            ),
                         isSelected = option.isSelected,
                         onClicked =
                             option.isSelected.map { isSelected ->
@@ -87,20 +93,14 @@
         }
     }
 
-    class Factory(
-        context: Context,
-        private val interactor: GridInteractor,
-    ) : ViewModelProvider.Factory {
+    class Factory(context: Context, private val interactor: GridInteractor) :
+        ViewModelProvider.Factory {
 
         private val applicationContext = context.applicationContext
 
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            return GridScreenViewModel(
-                context = applicationContext,
-                interactor = interactor,
-            )
-                as T
+            return GridScreenViewModel(context = applicationContext, interactor = interactor) as T
         }
     }
 }
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
index a5f5d22..6de560e 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
@@ -83,28 +83,36 @@
     private val _selectedTab = MutableStateFlow(Tab.STYLE)
     val selectedTab: StateFlow<Tab> = _selectedTab.asStateFlow()
     val tabs: Flow<List<FloatingToolbarTabViewModel>> =
-        _selectedTab.asStateFlow().map {
+        selectedTab.map {
             listOf(
                 FloatingToolbarTabViewModel(
-                    Icon.Resource(
-                        res = R.drawable.ic_clock_filled_24px,
-                        contentDescription = Text.Resource(R.string.clock_style),
-                    ),
-                    context.getString(R.string.clock_style),
-                    it == Tab.STYLE || it == Tab.FONT,
-                ) {
-                    _selectedTab.value = Tab.STYLE
-                },
+                    icon =
+                        Icon.Resource(
+                            res = R.drawable.ic_clock_filled_24px,
+                            contentDescription = Text.Resource(R.string.clock_style),
+                        ),
+                    text = context.getString(R.string.clock_style),
+                    isSelected = it == Tab.STYLE || it == Tab.FONT,
+                    onClick =
+                        if (it == Tab.STYLE || it == Tab.FONT) null
+                        else {
+                            { _selectedTab.value = Tab.STYLE }
+                        },
+                ),
                 FloatingToolbarTabViewModel(
-                    Icon.Resource(
-                        res = R.drawable.ic_palette_filled_24px,
-                        contentDescription = Text.Resource(R.string.clock_color),
-                    ),
-                    context.getString(R.string.clock_color),
-                    it == Tab.COLOR,
-                ) {
-                    _selectedTab.value = Tab.COLOR
-                },
+                    icon =
+                        Icon.Resource(
+                            res = R.drawable.ic_palette_filled_24px,
+                            contentDescription = Text.Resource(R.string.clock_color),
+                        ),
+                    text = context.getString(R.string.clock_color),
+                    isSelected = it == Tab.COLOR,
+                    onClick =
+                        if (it == Tab.COLOR) null
+                        else {
+                            { _selectedTab.value = Tab.COLOR }
+                        },
+                ),
             )
         }
 
@@ -166,16 +174,15 @@
                     } else {
                         fun() {
                             overridingClock.value = this
-                            overrideClockFontAxisMap.value = null
+                            overrideClockFontAxisMap.value = emptyMap()
                         }
                     }
                 },
         )
     }
 
-    // Clock Font Axis Editor
-    private val overrideClockFontAxisMap = MutableStateFlow<Map<String, Float>?>(null)
-    private val isFontAxisMapEdited = overrideClockFontAxisMap.map { it != null }
+    // Clock font axis
+    private val overrideClockFontAxisMap = MutableStateFlow<Map<String, Float>>(emptyMap())
     val selectedClockFontAxes =
         previewingClock
             .map { clock -> clock.fontAxes }
@@ -184,21 +191,31 @@
         selectedClockFontAxes
             .filterNotNull()
             .map { fontAxes -> fontAxes.associate { it.key to it.currentValue } }
-            .stateIn(viewModelScope, SharingStarted.Eagerly, null)
+            .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
+    private val isFontAxisMapEdited =
+        combine(overrideClockFontAxisMap, selectedClockFontAxisMap) {
+            overrideClockFontAxisMap,
+            selectedClockFontAxisMap ->
+            !overrideClockFontAxisMap.all { (key, value) -> selectedClockFontAxisMap[key] == value }
+        }
     val previewingClockFontAxisMap =
         combine(overrideClockFontAxisMap, selectedClockFontAxisMap.filterNotNull()) {
                 overrideAxisMap,
                 selectedAxisMap ->
-                overrideAxisMap?.let {
-                    val mutableMap = selectedAxisMap.toMutableMap()
-                    overrideAxisMap.forEach { (key, value) -> mutableMap[key] = value }
-                    mutableMap.toMap()
-                } ?: selectedAxisMap
+                if (overrideAxisMap.isEmpty()) {
+                    selectedAxisMap
+                } else {
+                    overrideAxisMap.let {
+                        val mutableMap = selectedAxisMap.toMutableMap()
+                        overrideAxisMap.forEach { (key, value) -> mutableMap[key] = value }
+                        mutableMap.toMap()
+                    }
+                }
             }
             .stateIn(viewModelScope, SharingStarted.Eagerly, emptyMap())
 
     fun updatePreviewFontAxis(key: String, value: Float) {
-        val axisMap = (overrideClockFontAxisMap.value?.toMutableMap() ?: mutableMapOf())
+        val axisMap = overrideClockFontAxisMap.value.toMutableMap()
         axisMap[key] = value
         overrideClockFontAxisMap.value = axisMap.toMap()
     }
@@ -208,7 +225,7 @@
     }
 
     fun cancelFontAxes() {
-        overrideClockFontAxisMap.value = null
+        overrideClockFontAxisMap.value = emptyMap()
         _selectedTab.value = Tab.STYLE
     }
 
@@ -237,7 +254,6 @@
         }
 
     // Clock color
-    // 0 - 100
     private val overridingClockColorId = MutableStateFlow<String?>(null)
     private val isClockColorIdEdited =
         combine(overridingClockColorId, clockPickerInteractor.selectedColorId) {
@@ -252,6 +268,7 @@
             overridingClockColorId ?: selectedColorId ?: DEFAULT_CLOCK_COLOR_ID
         }
 
+    // Clock color slider progress. Range is 0 - 100.
     private val overridingSliderProgress = MutableStateFlow<Int?>(null)
     private val isSliderProgressEdited =
         combine(overridingSliderProgress, clockPickerInteractor.colorToneProgress) {
@@ -395,21 +412,21 @@
     private val isEdited =
         combine(
             isClockEdited,
+            isFontAxisMapEdited,
             isClockSizeEdited,
             isClockColorIdEdited,
             isSliderProgressEdited,
-            isFontAxisMapEdited,
         ) {
             isClockEdited,
+            isFontAxisMapEdited,
             isClockSizeEdited,
             isClockColorEdited,
-            isSliderProgressEdited,
-            isFontAxisMapEdited ->
+            isSliderProgressEdited ->
             isClockEdited ||
+                isFontAxisMapEdited ||
                 isClockSizeEdited ||
                 isClockColorEdited ||
-                isSliderProgressEdited ||
-                isFontAxisMapEdited
+                isSliderProgressEdited
         }
 
     val onApply: Flow<(suspend () -> Unit)?> =
@@ -421,12 +438,12 @@
             previewingSliderProgress,
             previewingClockFontAxisMap,
         ) { array ->
-            val isEdited = array[0] as Boolean
-            val clock = array[1] as ClockMetadataModel
-            val size = array[2] as ClockSize
-            val previewingColorId = array[3] as String
-            val previewProgress = array[4] as Int
-            val axisMap = array[5] as Map<String, Float>
+            val isEdited: Boolean = array[0] as Boolean
+            val clock: ClockMetadataModel = array[1] as ClockMetadataModel
+            val size: ClockSize = array[2] as ClockSize
+            val previewingColorId: String = array[3] as String
+            val previewProgress: Int = array[4] as Int
+            val axisMap: Map<String, Float> = array[5] as Map<String, Float>
             if (isEdited) {
                 {
                     clockPickerInteractor.applyClock(
@@ -454,7 +471,7 @@
         overridingClockSize.value = null
         overridingClockColorId.value = null
         overridingSliderProgress.value = null
-        overrideClockFontAxisMap.value = null
+        overrideClockFontAxisMap.value = emptyMap()
         _selectedTab.value = Tab.STYLE
     }
 
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/KeyguardQuickAffordancePickerViewModel2.kt b/src/com/android/wallpaper/customization/ui/viewmodel/KeyguardQuickAffordancePickerViewModel2.kt
index 32ee209..704ab79 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/KeyguardQuickAffordancePickerViewModel2.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/KeyguardQuickAffordancePickerViewModel2.kt
@@ -49,10 +49,11 @@
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.take
 
 class KeyguardQuickAffordancePickerViewModel2
 @AssistedInject
@@ -82,9 +83,15 @@
             )
     private val overridingQuickAffordances = MutableStateFlow<Map<String, String>>(emptyMap())
     private val selectedQuickAffordancesGroupBySlotId =
-        quickAffordanceInteractor.selections.map {
-            it.groupBy { selectionModel -> selectionModel.slotId }
-        }
+        quickAffordanceInteractor.selections
+            .map { it.groupBy { selectionModel -> selectionModel.slotId } }
+            .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
+    // optimisticUpdateQuickAffordances updates right after applying button is clicked, while the
+    // actual update of selectedQuickAffordancesGroupBySlotId later updates until the system
+    // completes the update task. This can make sure the apply button state updates before we return
+    // to the previous screen.
+    private val optimisticUpdateQuickAffordances: MutableStateFlow<Map<String, String>?> =
+        MutableStateFlow(null)
 
     val previewingQuickAffordances =
         combine(
@@ -258,19 +265,18 @@
         }
 
     val onApply: Flow<(suspend () -> Unit)?> =
-        combine(overridingQuickAffordances, selectedQuickAffordancesGroupBySlotId) {
+        combine(overridingQuickAffordances, optimisticUpdateQuickAffordances) {
             overridingQuickAffordances,
-            selectedQuickAffordancesGroupBySlotId ->
-            // If all overridingQuickAffordances are same as the selected quick affordances, it is
-            // not yet edited
+            optimisticUpdateQuickAffordances ->
+            // If all overridingQuickAffordances is empty or are same as the
+            // optimisticUpdateQuickAffordances, it is not yet edited
             val isQuickAffordancesEdited =
                 (!overridingQuickAffordances.all { (slotId, overridingQuickAffordanceId) ->
-                    selectedQuickAffordancesGroupBySlotId[slotId]?.find {
-                        it.affordanceId == overridingQuickAffordanceId
-                    } != null
+                    optimisticUpdateQuickAffordances?.get(slotId) == overridingQuickAffordanceId
                 })
             if (isQuickAffordancesEdited) {
                 {
+                    this.optimisticUpdateQuickAffordances.value = overridingQuickAffordances
                     overridingQuickAffordances.forEach { entry ->
                         val slotId = entry.key
                         val affordanceId = entry.value
@@ -282,10 +288,6 @@
                                 affordanceId = affordanceId,
                             )
                         }
-                        // Suspend until the next selectedQuickAffordancesGroupBySlotId update
-                        this.selectedQuickAffordancesGroupBySlotId.take(1).collect {
-                            return@collect
-                        }
                         logger.logShortcutApplied(shortcut = affordanceId, shortcutSlotId = slotId)
                     }
                 }
diff --git a/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt b/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
index 638aa7c..1efc659 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
@@ -37,11 +37,13 @@
     ClockPickerRepository {
     override val allClocks: Flow<List<ClockMetadataModel>> = MutableStateFlow(clocks).asStateFlow()
 
-    private val selectedClockId = MutableStateFlow(fakeClocks[0].clockId)
-    @ColorInt private val selectedColorId = MutableStateFlow<String?>(null)
-    private val colorTone = MutableStateFlow(ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS)
-    @ColorInt private val seedColor = MutableStateFlow<Int?>(null)
-    private val fontAxes = MutableStateFlow<List<ClockFontAxis>>(listOf(buildFakeAxis(0)))
+    private val selectedClockId: MutableStateFlow<String> = MutableStateFlow(fakeClocks[0].clockId)
+    @ColorInt private val selectedColorId: MutableStateFlow<String?> = MutableStateFlow(null)
+    private val colorTone: MutableStateFlow<Int> =
+        MutableStateFlow(ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS)
+    @ColorInt private val seedColor: MutableStateFlow<Int?> = MutableStateFlow(null)
+    private val fontAxes: MutableStateFlow<List<ClockFontAxis>> =
+        MutableStateFlow(listOf(buildFakeAxis(0)))
     override val selectedClock: Flow<ClockMetadataModel> =
         combine(selectedClockId, selectedColorId, colorTone, seedColor, fontAxes) {
             selectedClockId,
diff --git a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt
index b035c84..50da94f 100644
--- a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt
@@ -28,7 +28,11 @@
 import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
 import com.android.customization.picker.color.data.repository.FakeColorPickerRepository2
 import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor2
+import com.android.themepicker.R
 import com.android.wallpaper.customization.ui.viewmodel.ClockPickerViewModel.Tab
+import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
+import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
+import com.android.wallpaper.picker.customization.ui.viewmodel.FloatingToolbarTabViewModel
 import com.android.wallpaper.testing.FakeSnapshotStore
 import com.android.wallpaper.testing.collectLastValue
 import com.google.common.truth.Truth.assertThat
@@ -107,11 +111,19 @@
     }
 
     @Test
-    fun selectedTab_whenClickOnTabs() = runTest {
+    fun selectedTab_whenClickOnTabStyle() = runTest {
         val tabs = collectLastValue(underTest.tabs)
         val selectedTab = collectLastValue(underTest.selectedTab)
 
+        tabs()?.get(0)?.onClick?.invoke()
+
         assertThat(selectedTab()).isEqualTo(Tab.STYLE)
+    }
+
+    @Test
+    fun selectedTab_whenClickOnTabColor() = runTest {
+        val tabs = collectLastValue(underTest.tabs)
+        val selectedTab = collectLastValue(underTest.selectedTab)
 
         tabs()?.get(1)?.onClick?.invoke()
 
@@ -119,17 +131,6 @@
     }
 
     @Test
-    fun tabs_whenClickOnTabs() = runTest {
-        val tabs = collectLastValue(underTest.tabs)
-
-        assertThat(tabs()?.get(0)?.isSelected).isTrue()
-
-        tabs()?.get(1)?.onClick?.invoke()
-
-        assertThat(tabs()?.get(1)?.isSelected).isTrue()
-    }
-
-    @Test
     fun selectedTab_fontEditorWhenClickSelectedClock() = runTest {
         val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
         val selectedTab = collectLastValue(underTest.selectedTab)
@@ -146,6 +147,69 @@
     }
 
     @Test
+    fun tabs_whenInitialState() = runTest {
+        val tabs = collectLastValue(underTest.tabs)
+
+        val resultTabs = checkNotNull(tabs())
+        assertThat(resultTabs).hasSize(2)
+        resultTabs.forEachIndexed { index, floatingToolbarTabViewModel ->
+            when (index) {
+                0 -> {
+                    assertFloatingToolbarTabViewModel(
+                        viewModel = floatingToolbarTabViewModel,
+                        icon =
+                            Icon.Resource(
+                                res = R.drawable.ic_clock_filled_24px,
+                                contentDescription = Text.Resource(R.string.clock_style),
+                            ),
+                        text = context.getString(R.string.clock_style),
+                        isSelected = true,
+                        isOnClickNull = true,
+                    )
+                }
+                1 -> {
+                    assertFloatingToolbarTabViewModel(
+                        viewModel = floatingToolbarTabViewModel,
+                        icon =
+                            Icon.Resource(
+                                res = R.drawable.ic_palette_filled_24px,
+                                contentDescription = Text.Resource(R.string.clock_color),
+                            ),
+                        text = context.getString(R.string.clock_color),
+                        isSelected = false,
+                        isOnClickNull = false,
+                    )
+                }
+            }
+        }
+    }
+
+    private fun assertFloatingToolbarTabViewModel(
+        viewModel: FloatingToolbarTabViewModel,
+        icon: Icon,
+        text: String,
+        isSelected: Boolean,
+        isOnClickNull: Boolean,
+    ) {
+        assertThat(viewModel.icon).isEqualTo(icon)
+        assertThat(viewModel.text).isEqualTo(text)
+        assertThat(viewModel.isSelected).isEqualTo(isSelected)
+        assertThat(viewModel.icon).isEqualTo(icon)
+        if (isOnClickNull) {
+            assertThat(viewModel.onClick).isNull()
+        } else {
+            assertThat(viewModel.onClick).isNotNull()
+        }
+    }
+
+    @Test
+    fun selectedClock_whenClickOnStyleOptions() = runTest {
+        val selectedClock = collectLastValue(underTest.selectedClock)
+
+        assertThat(selectedClock()?.clockId).isEqualTo(FakeClockPickerRepository.CLOCK_ID_0)
+    }
+
+    @Test
     fun previewingClock_whenClickOnStyleOptions() = runTest {
         val previewingClock = collectLastValue(underTest.previewingClock)
         val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
@@ -384,4 +448,128 @@
         assertThat(option1IsSelected()).isTrue()
         assertThat(option1OnClicked()).isNull()
     }
+
+    @Test
+    fun apply_nullWhenInitialState() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+
+        assertThat(onApply()).isNull()
+    }
+
+    @Test
+    fun apply_notNullWhenClockStyleChanged() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+        val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
+        // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockStyleOptions
+        advanceTimeBy(ClockPickerViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
+
+        val option1OnClicked = collectLastValue(clockStyleOptions()!![1].onClicked)
+        option1OnClicked()?.invoke()
+
+        assertThat(onApply()).isNotNull()
+    }
+
+    @Test
+    fun apply_nullAfterApplyingClockStyle() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+        val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
+        // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockStyleOptions
+        advanceTimeBy(ClockPickerViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
+
+        val option1OnClicked = collectLastValue(clockStyleOptions()!![1].onClicked)
+        option1OnClicked()?.invoke()
+        onApply()?.invoke()
+
+        assertThat(onApply()).isNull()
+    }
+
+    @Test
+    fun apply_notNullWhenFontAxisChanged() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+
+        underTest.updatePreviewFontAxis("key", 100f)
+
+        assertThat(onApply()).isNotNull()
+    }
+
+    @Test
+    fun apply_nullAfterApplyingFontAxis() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+
+        underTest.updatePreviewFontAxis("key", 100f)
+        onApply()?.invoke()
+
+        assertThat(onApply()).isNull()
+    }
+
+    @Test
+    fun apply_notNullWhenClockSizeChanged() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+        val onClockSizeSwitchCheckedChange =
+            collectLastValue(underTest.onClockSizeSwitchCheckedChange)
+
+        onClockSizeSwitchCheckedChange()?.invoke()
+
+        assertThat(onApply()).isNotNull()
+    }
+
+    @Test
+    fun apply_nullAfterApplyingClockSize() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+        val onClockSizeSwitchCheckedChange =
+            collectLastValue(underTest.onClockSizeSwitchCheckedChange)
+
+        onClockSizeSwitchCheckedChange()?.invoke()
+        onApply()?.invoke()
+
+        assertThat(onApply()).isNull()
+    }
+
+    @Test
+    fun apply_notNullWhenColorChanged() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+        val clockColorOptions = collectLastValue(underTest.clockColorOptions)
+        // Advance COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from
+        // clockColorOptions
+        advanceTimeBy(ClockPickerViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
+        val option1OnClicked = collectLastValue(clockColorOptions()!![1].onClicked)
+
+        option1OnClicked()?.invoke()
+
+        assertThat(onApply()).isNotNull()
+    }
+
+    @Test
+    fun apply_nullAfterApplyingColor() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+        val clockColorOptions = collectLastValue(underTest.clockColorOptions)
+        // Advance COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from
+        // clockColorOptions
+        advanceTimeBy(ClockPickerViewModel.COLOR_OPTIONS_EVENT_UPDATE_DELAY_MILLIS)
+        val option1OnClicked = collectLastValue(clockColorOptions()!![1].onClicked)
+
+        option1OnClicked()?.invoke()
+        onApply()?.invoke()
+
+        assertThat(onApply()).isNull()
+    }
+
+    @Test
+    fun apply_notNullWhenSliderProgressChanged() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+
+        underTest.onSliderProgressChanged(87)
+
+        assertThat(onApply()).isNotNull()
+    }
+
+    @Test
+    fun apply_nullAfterApplyingSliderProgress() = runTest {
+        val onApply = collectLastValue(underTest.onApply)
+
+        underTest.onSliderProgressChanged(87)
+        onApply()?.invoke()
+
+        assertThat(onApply()).isNull()
+    }
 }