Merge "Remove delay from interactive bugreport."

commit: 7cb1453a845245e530d1231a6bb88e4126571b5a [log] [tgz]
author: TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 22 15:26:26 2016 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Sep 22 15:26:26 2016 +0000
tree: a870bab048cbc720df719f6104b01ee074360dcf
parent: 29a95b49947c2379fff686f8182049e3f179c476 [diff]
parent: fce3e960fd0f932c3b3d186aa1e8b8c777b52a8a [diff]
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f2c7f1e..91f4091 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi ሲበራ የባትሪ አጠቃቀም ቀንስ"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi የሚጠቀመውን ባትሪ ገድብ"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi-Fi የበይነመረብ መድረሻን ካጣ ወደ ባለገመድ ውሂብ ለውጥ።"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"የተንቀሳቃሽ ስልክ ውሂብ ተሰናክሏል"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Wi-Fi የበይነመረብ ግንኙነት ሲጠፋበት የተንቀሳቃሽ ስልክ ውሂብን ተጠቀም። ተጨማሪ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"አውታረ መረብ አክል"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"የWi-Fi አውታረ መረቦች"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ግፊት አዘራር"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"ይህ አውታረ መረብ ምንም የበይነመረብ ግንኙነት የለውም። እንደተገናኙ ይቆዩ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ለዚህ አውታረመረብ ዳግመኛ አትጠይቅ"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi ከበይነመረብ ጋር አልተገናኘም"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi‑Fi መጥፎ ግንኙነት በሚኖረው ጊዜ ሁሉ ወደ ሴሉላር አውታረመረብ መቀየር ይችላሉ። የውሂብ አጠቃቀም ተፈጻሚ ሊሆን ይችላል።"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi‑Fi መጥፎ ግንኙነት በሚኖረው ጊዜ ሁሉ ወደ ተንቀሳቃሽ አውታረመረብ መቀየር ይችላሉ። የውሂብ አጠቃቀም ተፈጻሚ ሊሆን ይችላል።"</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"ወደ የተንቀሳቃሽ ስልክ ቀይር"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"በWi-Fi ላይ ይቆዩ"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"በፍፁም ዳግመኛ አታሳይ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"የአትረብሽ መዳረሻ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"ሰርጦች"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ከዚህ መተግበሪያዎች ማሳወቂያዎችን በፍጹም አታሳይ"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"ሁሉንም አግድ"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"ከዚህ ሰርጥ ማሳወቂያዎችን በፍጹም አታሳይ"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"«አትረብሽ»ን ሻር"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"«አትረብሽ» ወደ ቅድሚያ ብቻ በሚቀናበርበት ጊዜ እነዚህ ማሳወቂያዎች እንዲያቋርጡ ይፍቀዱ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"በማያ ገጽ ቁልፉ ላይ"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ሚስጥራዊነት ያለው"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ተከናውኗል"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"አስፈላጊነት"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"ሁልጊዜ የማሳወቂያ ብርሃን አሳይ"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"ሁልጊዜ ንዘር"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"የደንብ ስም"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"የደንብ ስም ያስገቡ"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"የደንብ ስም አስቀድሞ ጥቅም ላይ ውሏል"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f09f10f..8388bcc 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -801,10 +801,10 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"لا تتضمن هذه الشبكة اتصالاً بالإنترنت. هل تريد البقاء متصلاً؟"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"عدم السؤال مرة أخرى لهذه الشبكة"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"‏شبكة Wi‑Fi غير متصلة بالإنترنت"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏يمكنك التبديل إلى الشبكة الخلوية حين يكون الاتصال بشبكة Wi‑Fi سيئًا. وقد تنطبق رسوم استخدام البيانات."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"تبديل إلى الشبكة الخلوية"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏يمكنك التبديل إلى شبكة الجوّال عندما يكون اتصال Wi‑Fi بالإنترنت سيئًا، ويمكن أن يتم فرض رسوم على استخدام بيانات شبكة الجوّال."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"التبديل إلى شبكة الجوّال"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"‏الإبقاء على الاتصال بشبكة Wi‑Fi"</string>
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"عدم الإظهار مجددًا"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"عدم الإظهار مرة أخرى"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"أخفق التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 925fead..026b3ab 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -694,10 +694,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Smanji korišćenje baterije kada je Wi-Fi uključen"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Ogran. bat. koju koristi Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Pređi na podatke za mobilne uređaje ako Wi‑Fi izgubi pristup internetu."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Prelazak na mobilne podatke"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Koristite mobilne podatke kada Wi‑Fi izgubi pristup internetu. Mogu da se naplaćuju dodatne naknade."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi mreže"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS dugme"</string>
@@ -775,12 +773,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI SE"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ova mreža nema pristup internetu. Želite li da ostanete povezani?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne pitaj ponovo za ovu mrežu"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi mreža nije povezana sa internetom"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi mreža nije povezana sa internetom"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Možete da pređete na mobilnu mrežu kad god je Wi‑Fi veza loša. Može da vam bude naplaćen prenos podataka."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Pređi na mobilnu mrežu"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ne prikazuj nikada više"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ostani na Wi‑Fi-ju"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ne prikazuj ponovo"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje sa mrežom nije uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
@@ -2040,7 +2037,7 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"Rezervne kopije i resetovanje"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Rezervna kopija i resetovanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Pravljenje rezervnih kopija mojih podataka"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Pravljenje rezervnih kopija podataka"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Pravi rezervne kopije podataka o aplikacijama, Wi-Fi lozinki i drugih podešavanja na Google serverima"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Rezervna kopija naloga"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Uvrštavanje podataka aplikacija"</string>
@@ -2682,14 +2679,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zahtevala pristup opciji Ne uznemiravaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikada ne prikazuj obaveštenja iz ove aplikacije"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokiraj sve"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nikada ne prikazuj obaveštenja sa ovog kanala"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zameni režim Ne uznemiravaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Omogućava da ova obaveštenja nastave da se prikazuju kada je režim Ne uznemiravaj podešen na opciju Samo prioritetni prekidi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -2698,10 +2692,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osetljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Važnost"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Uvek aktiviraj pulsirajuću lampicu za obaveštenja"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Uvek vibriraj"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite naziv pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Naziv pravila se već koristi"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c4902a1..e5ef9bb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Намаляване на използването на батерията, когато Wi‑Fi е включен"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Разход на бат. от Wi‑Fi: Лимит"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Превключете към клетъчни данни, ако Wi‑Fi мрежата изгуби достъп до интернет."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Автоматично преминаване към мобилни данни"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Използване на мобилни данни, когато Wi‑Fi мрежата загуби достъп до интернет. Възможно е да бъдете таксувани допълнително."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавяне на мрежа"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi мрежи"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Бутон за WPS"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Тази мрежа няма достъп до интернет. Искате ли да останете свързани с нея?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Без повторно запитване за тази мрежа"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi мрежата не е свързана с интернет"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Когато Wi-Fi мрежата е с лоша връзка, можете да превключите към клетъчната мрежа. Възможно е да бъдете таксувани за пренос на данни."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Превключване към клетъчна мрежа"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Когато Wi-Fi връзката е лоша, можете да преминете към мобилната мрежа. Възможно е да бъдете таксувани за пренос на данни."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Превключване към мобилни данни"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Придържане към Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Повече да не се показва"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Канали"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Известията от това приложение никога не се показват"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Блокиране на всички"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Няма да се показват известия от този канал"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отмяна на „Не безпокойте“"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешаване на тези известия да продължат да ви прекъсват, когато за режим „Не безпокойте“ е зададено „Само с приоритет“."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Върху заключения екран"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Деликатно"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Важност"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Известяване с пулсираща светлина"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Известяване с вибриране"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Име на правилото"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Въведете име на правилото"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Името на правилото вече се използва"</string>

diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index c0a029f..e1a4943 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml

@@ -694,10 +694,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Korištenje baterije se svodi na minimum kada je Wi-Fi uključen"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit za bateriju za Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Prebaci se na prijenos mobilnih podataka kada Wi-Fi izgubi pristup Internetu."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Rezerva mobilnih podataka"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Koristite mobilne podatke kada Wi-Fi mreža izgubi pristup Internetu. Može doći do naplate dodatnih troškova."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi mreže"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pritisni WPS dugme"</string>
@@ -775,11 +773,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEZATI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ova mreža nema pristup Internetu. Ostati povezan na nju?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne pitaj me više za ovu mrežu"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi mreža nije povezana na internet"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi mreža nije povezana na Internet"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Možete se prebaciti na mobilnu mrežu kada je Wi‑Fi veza loša. Moguće je naplaćivanje troškova prijenosa podataka."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Prebaci na mobilnu mrežu"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ostani na Wi-Fi mreži"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nemoj više prikazivati"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži se"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje na mrežu nije uspjelo"</string>
@@ -2682,14 +2679,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup Ne smetaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikad ne prikazuj obavještenja iz ove aplikacije"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokiraj sve"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nikad ne prikazuj obavještenja sa ovog programa"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Premosti podešenja usluge Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Dozvolite da se ova obavještenja i dalje čuju kada je opcija Ne ometaj podešena na Samo prioritetna obavještenja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -2698,10 +2692,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Značaj"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Uvijek koristi pulsirajuće svjetlo obavještenja"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Uvijek vibriraj"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite naziv pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ime pravila se već koristi"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0ad5683..47becf3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimitza l\'ús de la bateria amb Wi-Fi activada"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Límit bateria usada per Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Utilitza les dades mòbils si la Wi-Fi perd l\'accés a Internet"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Utilitza les dades mòbils com a alternativa"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utilitza les dades mòbils quan la Wi‑Fi no pugui accedir a Internet. És possible que s\'apliquin càrrecs addicionals."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Afegeix una xarxa"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Xarxes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botó de WPS"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECTA"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Aquesta xarxa no té accés a Internet. Vols mantenir-hi la connexió?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"No ho tornis a preguntar en aquesta xarxa"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"La Wi-Fi no està connectada a Internet"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Pots canviar a la xarxa mòbil si la connexió a la xarxa Wi-Fi no és prou bona. Es poden aplicar càrrecs per l\'ús de dades."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"La Wi‑Fi no està connectada a Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Pots canviar a la xarxa mòbil sempre que la connexió a la Wi‑Fi no sigui prou bona. És possible que es cobri l\'ús de dades."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Canvia a la xarxa mòbil"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Mantén la connexió a la Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"No ho mostris mai més"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accés No molesteu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Cap aplicació instal·lada no ha sol·licitat accés No molesteu."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Canals"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostris mai les notificacions d\'aquesta aplicació"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloqueja-ho tot"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"No mostris mai notificacions d\'aquest canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Fes prioritària"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions continuïn interrompent quan el mode No molesteu estigui configurat com a Només amb prioritat"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A la pantalla de bloqueig"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fet"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importància"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Activa sempre el llum de notificació"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibra sempre"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la regla"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Introdueix el nom de la regla"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"El nom de regla ja s\'utilitza"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9949bbc..f9dff22 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimer batteribrug, når Wi-Fi er aktiveret"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Begræns batteri brugt af Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Skift til mobildata, hvis Wi-Fi mister adgangen til internettet."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Brug mobildata som alternativ"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Brug mobildata, når Wi-Fi mister internetadgang. Der opkræves muligvis yderligere gebyrer."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tilføj netværk"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-netværk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-trykknap"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"OPRET FORBINDELSE"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Dette netværk har ingen internetadgang. Vil du bruge netværket alligevel?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Spørg ikke igen for dette netværk"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi-netværket har ingen internetforbindelse"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kan skifte til mobilnetværket, når Wi-Fi-forbindelsen er dårlig. Der opkræves muligvis betaling for dataforbrug."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Skift til mobilnetværket"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi har ikke forbindelse til internettet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kan skifte til mobilnetværket, når Wi-Fi-forbindelsen er dårlig. Du skal muligvis betale for dataforbrug."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Skift til mobilnetværk"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Bliv på Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Vis aldrig igen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
@@ -2023,7 +2020,7 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"Backup og nulstilling"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sikkerhedskopiering og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier data"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopiér data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sikkerhedskopiér appdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backupkonto"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Adgang til \"Forstyr ikke\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerede apps har anmodet om adgang, når indstillingen \"Forstyr ikke\" er aktiveret."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanaler"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldrig underretninger fra denne app"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloker alle"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Vis aldrig underretninger fra denne kanal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Tilsidesæt Forstyr ikke"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er slået til med angivelsen Kun prioritet"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskærmen"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Følsomme"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Udfør"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Vigtighed"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Blink altid ved nye underretninger"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrer altid"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Indtast regelnavn"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Regelnavnet er allerede i brug"</string>
@@ -3091,7 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Netværksbegrænsninger"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Mobilselskabets dataopgørelse kan variere fra enhedens opgørelse."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> anvendt"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Angiv en dataadvarsel"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Indstil en dataadvarsel"</string>
     <string name="data_warning" msgid="209133958008062117">"Dataadvarsel"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angiv datagrænse"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrænse"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7510a6b..ded5c01 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Akkuverbrauch bei aktiviertem WLAN minimieren"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"WLAN-Akkuverbrauch beschränken"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Zu einem Mobilfunknetz wechseln, wenn das WLAN keinen Internetzugriff mehr hat"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Bei schwachem WLAN mobile Datennutzung verwenden"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Mobile Datennutzung verwenden, wenn das WLAN keinen Internetzugriff mehr hat. Es können zusätzliche Kosten anfallen."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netzwerk hinzufügen"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"WLAN-Netzwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-Push-Taste"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"Verbinden"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Dieses Netzwerk hat keinen Internetzugriff. Verbindung beibehalten?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Für dieses Netzwerk nicht mehr fragen"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Keine Internetverbindung über WLAN"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kannst zu mobilen Daten wechseln, wenn die WLAN-Verbindung schlecht ist. Hierbei können Gebühren für die Datennutzung anfallen."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Mobile Daten verwenden"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Keine Internetverbindung über WLAN vorhanden"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du hast die Möglichkeit, zum Mobilfunknetz zu wechseln, wenn deine WLAN-Verbindung schlecht ist. Allerdings können dann Kosten für die Datennutzung anfallen."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Zu mobilen Daten wechseln"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Weiterhin WLAN verwenden"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nicht mehr anzeigen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanäle"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Benachrichtigungen von dieser App nie anzeigen"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Alle blockieren"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Benachrichtigungen dieses Kanals nie anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Auf dem Sperrbildschirm"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensibel"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fertig"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Wichtigkeit"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Immer Benachrichtigungslicht pulsieren"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Immer vibrieren"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelname"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Regelnamen eingeben"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Regelname wird bereits verwendet."</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e1d29a8..b9c52b3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar el consumo de la batería con Wi-Fi activado"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limitar batería que usa Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Cambiar a datos móviles si la red Wi-Fi pierde acceso a Internet."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Resguardo de datos móviles"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utiliza los datos móviles cuando la red Wi-Fi pierde conexión a Internet. Es posible que apliquen cargos adicionales."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Agregar red"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsador WPS"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Esta red no tiene acceso a Internet. ¿Deseas mantener la conexión?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"No volver a preguntar para esta red"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"La red Wi-Fi no está conectada a Internet"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Cuando una red Wi-Fi tiene problemas de conexión, puedes cambiar a la red móvil. Es posible que se apliquen cargos por uso de datos."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi no está conectado a Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Puede cambiar a la red de datos móviles cuando la red Wi-Fi tiene una mala conexión. Es posible que se apliquen cargos por uso de datos."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Cambiar a datos móviles"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Seguir usando Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"No volver a mostrar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
@@ -2658,14 +2655,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada solicitó acceso a No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Canales"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloquear todos"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nunca mostrar notificaciones de este canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No interrumpir"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No interrumpir esté configurado como Solo prioridad"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla bloqueada"</string>
@@ -2674,10 +2668,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Personal"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importancia"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Siempre mostrar luz de notificación"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Siempre vibrar"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nombre de la regla"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ingresar el nombre de la regla"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ya se utilizó el nombre de regla"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 82a49c5..658bb7e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -934,11 +934,11 @@
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
     <string name="night_display_summary_off" msgid="7009821232380000786">"No. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No se activará nunca automáticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se activará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se activará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se activará automáticamente al anochecer."</string>
     <string name="night_display_summary_on" msgid="6626224414971753417">"Sí. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No se desactivará nunca automáticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se desactivará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se desactivará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se desactivará automáticamente al amanecer."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla se apaga"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 67a8fcd..4dea437 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"‏به حداقل رساندن مصرف باتری زمانی که Wi-Fi روشن است"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"‏محدود کردن مصرف باتری توسط Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"‏اگر دسترسی به اینترنت Wi‑Fi قطع شد، از داده تلفن همراه استفاده شود."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"بازگشت به داده شبکه تلفن همراه"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"‏وقتی دسترسی Wi‑Fi به اینترنت قطع می‌شود، از داده شبکه تلفن همراه استفاده کنید. ممکن است هزینه‌های اضافی اعمال شوند."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"افزودن شبکه"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"‏شبکه‌های Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"‏دکمه ارسال WPS"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"این شبکه به اینترنت دسترسی ندارد. به شبکه متصل بماند؟"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"دیگر درباره این شبکه سؤال نشود"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"‏Wi-Fi به اینترنت متصل نیست"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏وقتی اتصال Wi-Fi خوب نیست می‌توانید به شبکه تلفن همراه جابه‌جا شوید. هزینه استفاده از داده ممکن است اعمال شود."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏وقتی اتصال Wi-Fi  بد است، می‌توانید به شبکه تلفن همراه جابه‌جا شوید. ممکن است هزینه مصرف داده اعمال شود."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"جابه‌جایی به شبکه تلفن همراه"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"‏به Wi‑Fi متصل بمانید"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"هرگز دوباره نشان داده نشود"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
@@ -1423,7 +1420,7 @@
     <string name="install_unknown_applications_title" msgid="663831043139080992">"‏نصب برنامه‌ها از منابعی جز Google Play را برایتان امکان‌پذیر می‌کند"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"اجازه نصب برنامه‌ها از منابع ناشناس"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"رایانهٔ لوحی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس هستند. شما موافقت می‌کنید که در قبال هر گونه آسیب وارده به رایانهٔ لوحی خود یا از دست دادن داده که در نتیجه استفاده از این برنامه‌ها روی دهد تنها خودتان مسئول هستید."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"گوشی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس هستند. شما موافقت می‌کنید که در قبال هر گونه آسیبی که در نتیجه استفاده از این برنامه‌ها به گوشی شما وارد شود فقط خودتان مسئول هستید."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"گوشی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌هایی با منابع ناشناس است. شما موافقت می‌کنید که درقبال هرگونه آسیبی که در نتیجه استفاده از این برنامه‌ها به گوشی شما وارد شود فقط خودتان مسئول هستید."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"گزینه‌های تنظیمات بیشتری فعال شود"</string>
     <string name="application_info_label" msgid="5736524913065714880">"اطلاعات برنامه"</string>
@@ -2128,7 +2125,7 @@
     <string name="header_add_an_account" msgid="756108499532023798">"افزودن حساب"</string>
     <string name="finish_button_label" msgid="481587707657751116">"پایان"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"حساب حذف شود؟"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"با حذف این حساب تمام پیام‌ها، مخاطبین و دیگر داده‌هااز رایانهٔ لوحی نیز حذف می‌شوند!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"با حذف این حساب تمام پیام‌ها، مخاطبین و دیگر داده‌ها از رایانهٔ لوحی نیز حذف می‌شود!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"با حذف این حساب همه پیام‌ها، مخاطبین و دیگر داده‌ها از تلفن همراه حذف خواهد شد."</string>
     <string name="remove_account_failed" msgid="6980737964448187854">"این تغییر از طرف سرپرستتان مجاز دانسته نشده است"</string>
     <string name="provider_label" msgid="7724593781904508866">"اشتراک در پیام‌های سرویس"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"دسترسی به «مزاحم نشوید»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"هیچ برنامه نصب شده‌ای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"کانال‌ها"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"هرگز اعلانی از این برنامه نشان داده نمی‌شود"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"مسدود کردن همه"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"اعلان‌های این کانال هرگز نشان داده نمی‌شوند"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"لغو «مزاحم نشوید»"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"به این اعلان‌ها اجازه داده شود در شرایطی که «مزاحم نشوید» روی «فقط اولویت‌دار» تنظیم شده است، همچنان وقفه ایجاد کنند"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"در قفل صفحه"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"تمام"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"اهمیت"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"چراغ اعلان همیشه چشمک بزند"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"همیشه بلرزد"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"نام قانون"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"نام قانون را وارد کنید"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"نام قانون از قبل درحال استفاده است"</string>
@@ -2774,7 +2766,7 @@
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"وقتی دستگاه چرخانده می‌شود"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"چرخاندن محتوای صفحه"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ماندن در نمای عمودی"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ماندن در نمای منظره"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ماندن در نمای افقی"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ماندن در جهت کنونی"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"راه‌اندازی امن"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ادامه"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4d95b09..b9497f9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Vähennä akun kulutusta, kun Wi-Fi on käytössä"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Rajoita Wi‑Fin akun käyttöä"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Vaihda mobiilidataan, jos Wi-Fi-verkon internetyhteys katkeaa."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobiiliverkko varavaihtoehtona"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Vaihda mobiilidataan, jos Wi-Fi-yhteyttä ei voi muodostaa. Tästä voi aiheutua lisämaksuja."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lisää verkko"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-verkot"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Tässä verkossa ei ole internetyhteyttä. Säilytetäänkö yhteys?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Älä kysy uudelleen tässä verkossa"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi-yhteyttä ei voi muodostaa"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Jos Wi-Fi-signaali on heikko, voit käyttää mobiilidataa. Datasiirtomaksuja saatetaan veloittaa."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Jos Wi-Fi-signaali on heikko, voit käyttää mobiilidataa. Datan siirtämisestä voi aiheutua maksuja."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Vaihda mobiilidataan"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Jatka Wi-Fi-yhteydellä"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Älä näytä uudelleen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Älä häiritse -käyttöoikeudet"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yksikään asennettu sovellus ei ole pyytänyt Älä häiritse -tilan käyttöoikeutta."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanavat"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Älä koskaan näytä ilmoituksia tästä sovelluksesta."</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Estä kaikki"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Älä näytä tämän kanavan ilmoituksia"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ohita Älä häiritse -asetus"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Salli ilmoituksien näyttö, vaikka Älä häiritse -asetus on Vain tärkeät."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukitusnäytöllä"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Yksityisluontoinen"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Tärkeys"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Vilkuta aina ilmoitusvaloa"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Käytä aina värinää"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Säännön nimi"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nimeä sääntö."</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Säännön nimi on jo käytössä."</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 581269b..fd7e272 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limiter énergie util. par Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Utiliser les données cellulaires si vous n\'avez plus accès à Internet par réseau Wi‑Fi."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Utiliser données cellulaires en cas de problème de connexion"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utiliser le réseau de données cellulaires lorsque le réseau Wi-Fi perd l\'accès à Internet. Des frais supplémentaires peuvent s\'appliquer."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Réseaux Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Bouton commande WPS"</string>
@@ -769,8 +767,7 @@
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Le réseau Wi‑Fi n\'est pas connecté à Internet"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Vous pouvez passer au réseau cellulaire lorsque la connexion Wi‑Fi est faible. Des frais de données peuvent s\'appliquer."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Passer au réseau cellulaire"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Rester connecté au Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ne plus afficher"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connexion"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
@@ -1013,7 +1010,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Equipment ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Version de bande de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Version du noyau"</string>
-    <string name="build_number" msgid="3075795840572241758">"Numéro de build"</string>
+    <string name="build_number" msgid="3075795840572241758">"Numéro de version"</string>
     <string name="selinux_status" msgid="6212165375172061672">"État SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
@@ -1990,11 +1987,11 @@
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer depuis la mémoire"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer à partir de la carte SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer les certificats depuis la mémoire de stockage"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer les certificats depuis la carte SD"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer les certificats à partir de la carte SD"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Effacer les identifiants"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimez tous les certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Affichez les certificats d\'autorité de confiance"</string>
     <string name="user_credentials" msgid="3719013347787187083">"Authentifiants de l\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Afficher et modifier les authentifiants stockés"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"Avancés"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès au mode « Ne pas déranger »"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Canaux"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Tout bloquer"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Ne jamais afficher les notifications de ce canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode « Ne pas déranger »"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"À l\'écran de verrouillage"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminé"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Toujours afficher le voyant de notification"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Toujours vibrer"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Entrez le nom de la règle"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ce nom de règle est déjà utilisé"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 75558af..1db3c62 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limiter batterie util. par Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Utiliser les données mobiles si vous n\'avez plus accès à Internet via le réseau Wi‑Fi"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Utiliser les données mobiles en cas de problème de connexion"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Les données mobiles seront utilisées si vous n\'avez plus accès à Internet via le réseau Wi‑Fi. Des frais supplémentaires peuvent s\'appliquer."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Réseaux Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Utiliser WPS"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SE CONNECTER"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connecté ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne plus demander pour ce réseau"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Le Wi-Fi n\'est pas connecté à Internet"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Vous pouvez basculer sur le réseau mobile lorsque la connexion Wi-Fi est de mauvaise qualité. Des frais liés à la consommation de données peuvent s\'appliquer."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Basculer sur le réseau mobile"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Le réseau Wi‑Fi n\'est pas connecté à Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Vous pouvez vous connecter au réseau mobile lorsque vous rencontrez un problème de connexion Wi-Fi. Des frais liés à la consommation de données peuvent s\'appliquer."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Utiliser le réseau mobile"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Rester en Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ne plus afficher"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès \"Ne pas déranger\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aucune demande d\'accès \"Ne pas déranger\" n\'a été envoyée par les applications installées."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Chaînes"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Tout bloquer"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Ne jamais afficher les notifications de cette chaîne"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer l\'option \"Ne pas déranger\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Autoriser les interruptions par ces notifications lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sur l\'écran de verrouillage"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"OK"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Toujours afficher le voyant de notification"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Toujours déclencher le vibreur"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nom de la règle"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Saisissez le nom de la règle"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ce nom de règle est déjà utilisé."</string>

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index d99fbd4..1d5e2de 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml

@@ -345,7 +345,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear coa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usa a túa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Toca o sensor da impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: A túa impresión dixital é menos segura que un padrón seguro ou un PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Só tes que tocar o sensor de impresión dixital para autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: Non podes usar a túa impresión dixital para desbloquear este dispositivo. Para obter máis información, contacta co administrador da túa organización."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Só tes que tocar o sensor de impresión dixital para autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa se pode facer todo o indicado previamente.\n\nNota: Non podes usar a túa impresión dixital para desbloquear este dispositivo. Para obter máis información, contacta co administrador da túa organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Toca o sensor da impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: A túa impresión dixital é menos segura que un padrón seguro ou un PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar o uso da batería cando a wifi está activada"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Restrinxe a batería da wifi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Cambiar a datos móbiles se a wifi perde o acceso a Internet."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Alternativa dos datos móbiles"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utiliza datos móbiles cando a wifi perde o acceso a Internet. É posible que se apliquen cargos adicionais."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Engadir rede"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes wifi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botón de WPS Push"</string>
@@ -769,8 +767,7 @@
     <string name="lost_internet_access_title" msgid="6228530645663584505">"A wifi non está conectada a Internet"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Podes cambiar á rede móbil sempre que a wifi teña unha mala conexión. É posible que esta acción implique o uso de datos."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Cambiar á rede móbil"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Permanecer na wifi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Non mostrar de novo"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Erro ao conectar á rede"</string>
@@ -1140,7 +1137,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Outro"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Na sección Outros inclúense os ficheiros compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou por Bluetooth, os ficheiros de Android, etc. \n\nPara ver o contido visible deste <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Na sección Outros inclúense os ficheiros compartidos que gardaron as aplicacións, os ficheiros descargados de Internet por Bluetooth, os ficheiros de Android, etc. \n\nPara ver o contido visible desta <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"O sistema inclúe ficheiros que Android non pode mostrar de forma individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É posible que <xliff:g id="USER_0">^1</xliff:g> teña gardadas fotos, música, películas, aplicacións ou outros datos que están ocupando <xliff:g id="SIZE">^2</xliff:g> de almacenamento. \n\nPara ver os detalles, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso de Non molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso de Non molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Canles"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrar nunca as notificacións desta aplicación"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloquear todo"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Non mostrar nunca notificacións desta canle"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular opción Non molestar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificacións sigan interrompendo cando a opción Non molestar estea configurada como Só prioridade"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na pantalla de bloqueo"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidencial"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Feito"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importancia"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Luz de notificación sempre"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibración sempre"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da norma"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Introduce o nome da norma"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"O nome de regra xa se utiliza"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b238cf1..8d2b3b8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -1137,7 +1137,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्‍सप्‍लोर करें"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्य में, ऐप्लिकेशन द्वारा सहेजी गईं साझा फ़ाइलें, इंटरनेट या ब्लूटूथ से डाउनलोड की गईं फ़ाइलें, Android फ़ाइलें आदि शामिल होती हैं. \n\nइस <xliff:g id="NAME">^1</xliff:g> की दृश्यमान सामग्री देखने के लिए, एक्सप्लोर करें पर टैप करें."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्य में, ऐप्लिकेशन द्वारा सहेजी गई साझा फ़ाइलें, इंटरनेट या ब्लूटूथ से डाउनलोड की गई फ़ाइलें, Android फ़ाइलें आदि शामिल होती हैं. \n\nइस <xliff:g id="NAME">^1</xliff:g> की दृश्यमान सामग्री देखने के लिए, एक्सप्लोर करें पर टैप करें."</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"सिस्टम में वे फ़ाइलें शामिल होती हैं जिन्हें Android अलग-अलग नहीं दिखा सकता."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> में सहेजी गई फ़ोटो, संगीत, फ़िल्‍में, ऐप्‍स या अन्‍य डेटा हो सकता है जो <xliff:g id="SIZE">^2</xliff:g> संग्रहण का उपयोग कर रहा है. \n\nविवरण देखने के लिए, <xliff:g id="USER_1">^1</xliff:g> में स्‍विच करें."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"अपना <xliff:g id="NAME">^1</xliff:g> सेट करें"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9ef6988c..0e3edcc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -773,9 +773,9 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ta mreža nema pristup internetu. Želite li ostati povezani?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Više ne pitaj za tu mrežu"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi nije povezan s internetom"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Možete se prebaciti na mobilnu mrežu kad god Wi-Fi ima slabu vezu. Moguća je naplata potrošnje podataka."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Prebaci na mobilnu mrežu"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi mreža nije povezana s internetom"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"U  slučaju loše veze s Wi-Fi mrežom, uvijek možete prijeći na mobilnu mrežu. Mogu se naplatiti naknade za podatkovni promet."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Prelazak na mobilnu mrežu"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ostani na Wi‑Fi-ju"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nemoj više prikazivati"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index ee59887..6440c2e 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Մարտկոցի օգտագործումը հասցնել նվազագույնի, երբ Wi‑Fi-ը միացված է"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Սահմանափակել մարտկոցի օգտագործումը Wi-Fi-ի կողմից"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Անցնել բջջային կապի, երբ Wi-Fi ցանցն անջատվում է համացանցից:"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Անցնել բջջային ցանցին"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Օգտագործել բջջային ցանցի ինտերնետ կապը, եթե Wi-Fi ցանցն անջատված է ինտերնետից: Դրա համար ձեր օպերատորը կարող է լրացուցիչ գումար գանձել:"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ավելացնել ցանց"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi ցանցեր"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS սեղմման կոճակ"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ՄԻԱՆԱԼ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Այս ցանցը համացանց մուտք գործելու իրավունք չունի: Մնա՞լ միացած:"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Չհարցնել այլևս այս ցանցի համար"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi ցանցը ինտերնետին միացած չէ"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Եթե Wi-Fi կապի որակը ցածր է, կարող եք օգտվել բջջային ցանցի ինտերնետ կապից: Դրա համար ձեր օպերատորը կարող է գումար գանձել:"</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Անցնել բջջային ցանցի"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi սարքը միացած չէ համացանցին"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Եթե Wi‑Fi կապը թույլ է, կարող եք միացնել բջջային ցանցը: Կարող է գանձվել գումար՝ համաձայն սակագնային պլանի:"</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Անցնել բջջային համացանցի"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Մնալ Wi-Fi ցանցում"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Այլևս չցուցադրել"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Միանալ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ցանցին միանալ չհաջողվեց"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Հասանելիությունը՝ «չանհանգստացնել»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Ալիքներ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Երբեք ցույց չտալ ծանուցումներ այս ծրագրից"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Արգելափակել բոլորը"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Երբեք ցույց չտալ ծանուցումներ այս ալիքից"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չընդհատել» պարամետրը"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չընդհատել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Կողպէկրանին"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Զգայուն"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Պատրաստ է"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Կարևորություն"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Միշտ միացնել ծանուցման լույսի թարթումը"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Միշտ թրթռալ"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Կանոնի անունը"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Մուտքագրեք կանոնի անունը"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Կանոնի անունն արդեն օգտագործվում է"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fb846fe..db9689c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalkan penggunaan baterai saat Wi-Fi aktif"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Batasi penggunaan baterai oleh Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Beralih ke data seluler jika Wi-Fi kehilangan akses internet."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Pengganti data seluler"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Gunakan data seluler saat Wi-Fi kehilangan akses internet. Mungkin dikenakan biaya tambahan."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambahkan jaringan"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Jaringan Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tombol Tekan WPS"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SAMBUNGKAN"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Jaringan ini tidak memiliki akses internet. Tetap sambungkan?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Jangan tanya lagi untuk jaringan ini"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi tidak tersambung ke Internet"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Anda dapat beralih ke jaringan seluler ketika sambungan Wi-Fi buruk. Penggunaan data mungkin berlaku."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi tidak tersambung ke internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Anda dapat beralih ke jaringan seluler jika sambungan Wi-Fi buruk. Mungkin dikenakan penggunaan data."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Beralih ke seluler"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Tetap di Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Jangan tampilkan lagi"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Saluran"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan pernah tampilkan notifikasi dari aplikasi ini"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokir semua"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Jangan pernah tampilkan notifikasi dari saluran ini"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ganti mode Jangan Ganggu"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Di layar kunci"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Tingkat Kepentingan"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Selalu kedipkan lampu notifikasi"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Selalu bergetar"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nama aturan"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Masukkan nama aturan"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nama aturan sudah digunakan"</string>

diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index aa48194..697a104 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Draga úr rafhlöðunotkun þegar kveikt er á Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Takmarka rafhlöðunotkun Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Skipta yfir í farsímagögn ef Wi-Fi glatar nettengingunni."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Skipta yfir í farsímagögn ef þarf"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Nota farsímagögn þegar Wi-Fi tapar nettengingunni. Viðbótargjöld kunna að eiga við."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Bæta við neti"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi net"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-hnappur"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Enginn internetaðgangur er á þessu neti. Viltu halda tengingu við það?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ekki spyrja aftur fyrir þetta net"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi er ekki tengt internetinu"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Þú getur skipt yfir í farsímakerfi þegar Wi-Fi-tenging er léleg. Gjöld kunna að vera tekin fyrir gagnanotkun."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Þú getur skipt yfir í farsímakerfi þegar Wi-Fi-tenging er léleg. Gjöld kunna að verða tekin fyrir gagnanotkun."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Skipta yfir í farsímakerfi"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Halda áfram á Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Aldrei sýna aftur"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Tengjast"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ekk tókst að tengjast neti"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ónáðið ekki“ aðgangur"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Engin uppsett forrit hafa óskað eftir „Ónáðið ekki“ aðgangi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Rásir"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Birta aldrei tilkynningar úr þessu forriti"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Útiloka allt"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Birta aldrei tilkynningar frá þessari rás"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Hnekkja „Ónáðið ekki“"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Láta þessar tilkynningar halda áfram að trufla þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Á lásskjá"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Viðkvæmt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Lokið"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Mikilvægi"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Láta tilkynningarljós alltaf blikka hægt"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Titra alltaf"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Heiti reglu"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Sláðu inn heiti reglu"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Heiti reglu er þegar í notkun"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2ac661b..43aadab 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -703,10 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"‏צמצם את השימוש בסוללה כאשר Wi-Fi פועל"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"‏הגבל את השימוש של Wi‑Fi בסוללה"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"‏עבור לרשת סלולרית אם ה-Wi‑Fi יתנתק מהאינטרנט."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"חלופה של נתונים סלולריים"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"‏השתמש בנתונים סלולריים כשחיבור ה-Wi-Fi לאינטרנט מתנתק. ייתכן שיחולו עלויות נוספות."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"הוסף רשת"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"‏רשתות Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"‏לחצן WPS"</string>
@@ -784,12 +782,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"חבר"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"אין לרשת הזו חיבור לאינטרנט. האם להישאר מחובר?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"אל תשאל שוב בשביל הרשת הזו"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"‏Wi-Fi אינו מחובר לאינטרנט"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏אתה יכול לעבור לרשת הסלולר בכל פעם שחיבור ה-Wi-Fi לא תקין. שימוש ברשת הסלולרית עשוי להיות מלווה בחיובים."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"עבור לסלולר"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"אל תציג שוב"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"‏רשת ה-Wi-Fi אינה מחוברת לאינטרנט"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏ניתן לעבור לרשת הסלולרית בכל פעם שהחיבור של רשת ה-Wi-Fi אינו תקין. ייתכן שתחויב על שימוש בנתונים."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"עבור לרשת סלולרית"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"‏הישאר ברשת Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"אל תציג שוב אף פעם"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
@@ -1160,7 +1157,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"אחר"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"מערכת"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"עיין ב-<xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"‏קבצים אחרים כוללים, בין השאר, קבצים משותפים שנשמרו על-ידי אפליקציות, קבצים שהורדו מהאינטרנט או מ-Bluetooth, קובצי Android וכו\'. \n\nכדי לראות את התוכן הגלוי ב-<xliff:g id="NAME">^1</xliff:g>, הקש על \'גלה\'."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"‏קבצים אחרים כוללים, בין השאר, קבצים משותפים שנשמרו על-ידי אפליקציות, קבצים שהורדו מהאינטרנט או באמצעות Bluetooth, קובצי Android וכו\'. \n\nכדי לראות את התוכן הגלוי ב-<xliff:g id="NAME">^1</xliff:g>, הקש על \'גלה\'."</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"‏המערכת כוללת קבצים שלא ניתן להציג בנפרד ב-Android."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"ייתכן של-<xliff:g id="USER_0">^1</xliff:g> יש תמונות, מוזיקה, סרטים, אפליקציות או נתונים אחרים שתופסים <xliff:g id="SIZE">^2</xliff:g> מנפח האחסון. \n\nעבור אל <xliff:g id="USER_1">^1</xliff:g> כדי לראות פרטים."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"הגדרת <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -2706,14 +2703,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"ערוצים"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"לעולם אל תציג הודעות מהאפליקציה הזו"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"חסום הכל"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"אל תציג אף פעם הודעות מהערוץ הזה"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ביטול / שינוי של \'נא לא להפריע\'"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"אפשר להודעות אלה להמשיך ולהפריע כאשר \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"במסך הנעילה"</string>
@@ -2722,10 +2716,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"רגיש"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"בוצע"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"חשיבות"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"הפעל תמיד התראה מהבהבת"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"הפעל תמיד רטט"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"שם הכלל"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"תן שם לכלל"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"שם הכלל כבר נמצא בשימוש"</string>

diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f3117a3..f2613b5 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml

@@ -345,7 +345,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Саусақ ізімен құлыпты ашу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Саусақ ізін пайдалану"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: саусақ ізінің қауіпсіздігі күшті өрнектен немесе PIN кодынан азырақ болуы мүмкін."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Сатып алуларды авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Бір рет қосылса болғаны, олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: бұл құрылғының құлпын ашу үшін саусақ ізін пайдалана алмайсыз. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Сатып алу әрекеттерін авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Бір рет қосылса болғаны, олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: бұл құрылғының құлпын ашу үшін саусақ ізін пайдалана алмайсыз. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Телефон құлпын ашу, сатып алғандарды авторизациялау немесе қолданбаларға кіру үшін жай ғана саусақ ізін оқу сканерін түртіңіз. Басқа саусақ іздерін қосарда сақ болыңыз. Өйткені бір саусақ ізі қосылған болса да, оның иесі бұл әрекеттердің барлығын орындай алады.\n\nЕскертпе: саусақ ізінің қауіпсіздік деңгейі күрделі өрнектен немесе PIN кодынан төмен болуы мүмкін."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Бас тарту"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Жалғастыру"</string>
@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi қосылғанда батарея қолданысын азайту"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi пайдаланатын батареяны шектеу"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi-Fi интернеттен ажыратылса, ұялы деректерге ауысу."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Ұялы деректер резерв түрінде пайдаланылады"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Wi-Fi интернеттен ажыратылса, ұялы деректерді пайдалану. Қосымша ақы алынуы мүмкін."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Желі қосу"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi желілері"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push түймесі"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ҚОСЫЛУ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Бұл желіде интернет байланысы жоқ. Байланыста қалу қажет пе?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Осы желі үшін енді сұралмасын"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi интернетке жалғанбаған"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi‑Fi сапасы нашар болған жағдайда ұялы байланысқа ауысуға болады. Деректер ақысы алынуы мүмкін."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Ұялы байланысқа ауысу"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi желісі интернетке жалғанбаған"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi‑Fi байланысы нашар болған кезде ұялы желіге ауыса аласыз. Деректер ақысы алынуы мүмкін."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Ұялы желіге ауысу"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi желісінде қалу"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Қайта көрсетілмесін"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Жалғау"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Желіге қосылу орындалмады"</string>
@@ -944,7 +941,7 @@
     <string name="night_display_summary_on" msgid="6626224414971753417">"Қосулы. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ешқашан автоматты өшпейді."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Автоматты өшеді: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Күн шыққанда автоматты өшеді"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Күн шыққанда автоматты өшеді."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ұйқы"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өшеді"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Әрекетсіз <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> тұрған соң"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Мазаламау режиміне кіру"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Арналар"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығына тыйым салу"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Осы қолданбадан келген хабарландыруларды ешқашан көрсетпеу"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Барлығына тыйым салу"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Бұл арнаның хабарландырулары ешқашан көрсетілмесін"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Мазаламау\" режимін қайта анықтау"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Мазаламау\" режимі \"Тек маңызды\" күйіне орнатылған кезде, осы хабарландыруларға рұқсат беру"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Құлып экранында"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Құпия"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Дайын"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Маңыздылық"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Әрқашан хабарландыру шамы жансын"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Әрқашан дірілдеу қолданылсын"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ереже атауы"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ереже атауын енгізіңіз"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ереже атауы бұрыннан пайдаланылуда"</string>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index a54221e..417abc7 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml

@@ -345,7 +345,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ដោះសោដោយប្រើស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ប្រើស្នាមម្រាមដៃរបស់អ្នក"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"គ្រាន់តែប៉ះលើឧបករណ៍ចាប់ស្នាមម្រាមដៃប៉ុណ្ណោះដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក អនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ទោះបីជាបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលខ្លាំងនោះទេ។"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"គ្រាន់តែប៉ះលើឧបករណ៍សម្គាល់ស្នាមម្រាមដៃប៉ុណ្ណោះដើម្បីអនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ទោះបីជាអ្នកបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រងអង្គភាពរបស់អ្នក។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"គ្រាន់តែប៉ះលើឧបករណ៍សម្គាល់ស្នាមម្រាមដៃប៉ុណ្ណោះ ដើម្បីអនុញ្ញាតការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃរបស់បុគ្គលដែលអ្នកបន្ថែម។ ទោះបីជាអ្នកបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងរដ្ឋបាលក្នុងអង្គភាពរបស់អ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"គ្រាន់តែប៉ះលើឧបករណ៍ចាប់ស្នាមម្រាមដៃប៉ុណ្ណោះដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក អនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ទោះបីជាបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN រឹងមាំនោះទេ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"បោះបង់"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"បន្ត"</string>
@@ -935,13 +935,13 @@
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ម៉ោងចាប់ផ្ដើម"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ម៉ោងបញ្ចប់"</string>
     <string name="night_display_summary_off" msgid="7009821232380000786">"បិទ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"នឹងមិនបើកដោយស្វ័យប្រវត្តិនោះទេ"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"នឹងបើកដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"នឹងបើកដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃលិច"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"បើក <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"នឹងបិទដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"នឹងបិទដោយស្វ័យប្រវត្តិពេលថ្ងៃរះ"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"នឹងមិនបើកដោយស្វ័យប្រវត្តិនោះទេ។"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"នឹងបើកដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>។"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"នឹងបើកដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃលិច។"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"បើក។ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ។"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"នឹងបិទដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>។"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"នឹងបិទដោយស្វ័យប្រវត្តិពេលថ្ងៃរះ។"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ដេក"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"អេក្រង់បិទ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"បន្ទាប់ពីអសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1137,8 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"ផ្សេងៗ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ប្រព័ន្ធ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"រុករក <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ឯកសារផ្សេងៗរាប់បញ្ចូលទាំងឯកសារដែលបានចែករំលែកដោយកម្មវិធី ឯកសារដែលបានទាញយកពីអ៊ីនធឺណិត ឬប៊្លូធូស និងឯកសារ Android ជាដើម។ \n\nដើម្បីមើលមាតិកាទាំងស្រុងរបស់ <xliff:g id="NAME">^1</xliff:g> សូមប៉ះ រុករក។"</string>
-    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"ប្រព័ន្ធរាប់បញ្ចូលទាំងឯកសារដែល Android មិនអាចបង្ហាញបានដាច់ដោយឡែក។"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ឯកសារផ្សេងៗរួមមានឯកសារចែករំលែក ដែលរក្សាទុកដោយកម្មវិធី ឯកសារដែលបានទាញយកពីអ៊ីនធឺណិត ឬប៊្លូធូស និងឯកសារ Android ជាដើម។ \n\nដើម្បីមើលមាតិកាដែលមើលឃើញរបស់ <xliff:g id="NAME">^1</xliff:g> សូមប៉ះ រុករក។"</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"ប្រព័ន្ធរួមមានឯកសារដែល Android មិនអាចបង្ហាញដាច់ដោយឡែកបាន។"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ប្រហែលជាបានរក្សារូបភាព តន្ត្រី ភាពយន្ត កម្មវិធី ឬទិន្នន័យផ្សេងទៀតដែលមានទំហំ <xliff:g id="SIZE">^2</xliff:g> នៃឧបករណ៍ផ្ទុក។ \n\nដើម្បីមើលព័ត៌មានលម្អិត សូមប្តូរទៅ <xliff:g id="USER_1">^1</xliff:g>។"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ដំឡើង <xliff:g id="NAME">^1</xliff:g> របស់អ្នក"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ប្រើជាឧបករណ៍ផ្ទុកចល័ត"</string>

diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f276d95..ebc91e2 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml

@@ -1006,7 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android ಆವೃತ್ತಿ"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android ಭದ್ರತೆ ಪ್ಯಾಚ್ ಮಟ್ಟ"</string>
-    <string name="model_info" msgid="1952009518045740889">"ಮಾದರಿ"</string>
+    <string name="model_info" msgid="1952009518045740889">"ಮಾಡೆಲ್"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ಸಲಕರಣೆ ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"ಬೇಸ್‌ಬ್ಯಾಂಡ್ ಆವೃತ್ತಿ"</string>
     <string name="kernel_version" msgid="9192574954196167602">"ಕೆರ್ನಲ್ ಆವೃತ್ತಿ"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e1fd397..e8605a3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi가 사용 중일 때 배터리 사용량 최소화"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi에 사용되는 배터리 제한"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi‑Fi 인터넷 액세스가 끊긴 경우 모바일 데이터로 전환합니다."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"모바일 데이터 대체"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Wi-Fi 인터넷 액세스가 끊기면 모바일 데이터를 사용합니다. 모바일 데이터 사용 시 추가 요금이 부과될 수 있습니다."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"네트워크 추가"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 네트워크"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 푸시 버튼"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"연결"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"이 네트워크에는 인터넷이 연결되어 있지 않습니다. 연결 상태를 유지하시겠습니까?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"이 네트워크를 다시 요청하지 마세요."</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi가 인터넷에 연결되어 있지 않습니다."</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi-Fi 접속 불량 시 모바일 네트워크로 전환할 수 있습니다. 이 경우 데이터 사용료가 부과될 수 있습니다."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi가 인터넷에 연결되어 있지 않음"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi-Fi 연결 상태가 좋지 않을 때 언제든지 모바일 데이터로 전환할 수 있습니다. 모바일 데이터 사용 시 데이터 요금이 부과될 수 있습니다."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"모바일 데이터로 전환"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi‑Fi 계속 사용"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"다시 표시하지 않음"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"알림 일시중지 액세스"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"설치된 앱 중에서 알림 일시중지 액세스를 요청한 앱이 없습니다."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"채널"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"이 앱의 알림 표시 안함"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"모두 차단"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"이 채널의 알림 표시 안함"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"알림 일시중지 무시"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"알림 일시중지가 중요 알림만으로 설정된 경우 이러한 알림을 계속 받도록 허용합니다."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"잠금 화면에서"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"중요"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"완료"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"중요도"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"항상 알림등 반복 표시"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"항상 진동"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"규칙 이름"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"규칙 이름 입력"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"이미 사용 중인 규칙 이름입니다."</string>

diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 627519c..cdb24a6 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml

@@ -684,10 +684,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi иштегенде батарейди пайдаланууну минималдаштыруу"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi\'дн батаряны пайдалн чект"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Эгер Wi‑Fi Интернетке чыга албаса, уюлдук тармак иштетилсин"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Wi-Fi тармагы начар болгондо, мобилдик дайындар колдонулсун"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Wi-Fi Интернет тармагынан ажыраганда, мобилдик дайындар колдонулсун. Кошумча акы төлөп калышыңыз мүмкүн."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Тармак кошуу"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi түйүндөрү"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push баскычы"</string>
@@ -765,11 +763,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ТУТАШУУ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Бул тармак Интернетке туташпай турат. Аны колдоно бересизби?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Бул тармак үчүн экинчи сураба"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi интернетке туташкан эмес"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi Интернет тармагынан ажыратылды"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi-Fi байланышы начар болгондо, ар дайым уюлдук тармакка өтө аласыз. Дайындардын өткөрүлгөндүгү үчүн акы алынышы мүмкүн."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Уюлдук тармакка өтүү"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi тармагында калуу"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Кайра көрсөтүлбөсүн"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Туташуу"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Түйүндгө байланышкан жок"</string>
@@ -2659,14 +2656,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясын пайдалануу"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Каналдар"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Бул колдонмодо эскертмелер эч качан көрсөтүлбөсүн"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Баарын бөгөттөө"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Бул каналда эскертмелер эч качан көрсөтүлбөсүн"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Тынчымды албаны өзгөртүп коюу"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Тынчымды алба режиминде\" \"Маанилүү гана\" деп белгиленсе ушул эскертмелерге уруксат берилет"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Кулпуланган экранда"</string>
@@ -2675,10 +2669,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Сезимтал"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Бүттү"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Маанилүүлүгү"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Эскертменин жарыгы дайыма жаркылдасын"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Ар дайым дирилдесин"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Эреженин аталышы"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Эреженин аталышын киргизиңиз"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Мындай аталыштагы эреже бар"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fa44a03..4336419 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -694,10 +694,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Pēc iespējas samazināt akumulatora lietojumu, kad Wi-Fi savienojums ir ieslēgts"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi-Fi: akumulatora izmantošana"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Pārslēgties uz mobilajiem datiem, ja Wi-Fi tīklā nav pieejams internets"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Atkāpšanās uz mobilo datu izmantošanu"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Izmantojiet mobilo datu savienojumu, kad Wi‑Fi zaudē interneta savienojumu. Var tikt piemērota papildu maksa."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pievienot tīklu"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi tīkli"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS spiedpoga"</string>
@@ -776,10 +774,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Šim tīklam nav interneta piekļuves. Vai turpināt savienojumu?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Vairs nejautāt par šo tīklu"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi nav savienots ar internetu"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Jūs varat pārslēgties uz mobilo tīklu ikreiz, kad ir slikts Wi-Fi savienojums. Var tikt piemērota maksa par datu lietojumu."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Varat pārslēgties uz mobilo tīklu ikreiz, kad ir slikts Wi-Fi savienojums. Var tikt piemērota maksa par datu lietojumu."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Pārslēgties uz mobilo tīklu"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Turpināt izmantot Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Vairs nerādīt"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
@@ -2682,14 +2679,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Piekļuve pie “Netraucēt”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve režīmam “Netraucēt”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanāli"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nekad nerādīt paziņojumus no šīs lietotnes"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloķēt visu"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nekad nerādīt paziņojumus no šī kanāla"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorēt režīmu “Netraucēt”"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ļaut šiem paziņojumiem pārtraukt arī turpmāk, ja režīms “Netraucēt” ir iestatīts uz “Tikai prioritārie”"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Bloķēšanas ekrānā"</string>
@@ -2698,10 +2692,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitīvi"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gatavs"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Svarīgums"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Vienmēr mirgojošs paziņojuma indikators"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vienmēr vibrozvans"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Kārtulas nosaukums"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ievadiet kārtulas nosaukumu"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Kārtulas nosaukums jau tiek izmantots"</string>

diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index f001068..3d5a424 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"വൈഫൈ ഓണായിരിക്കുമ്പോൾ ബാറ്ററി ഉപഭോഗം കുറയ്‌ക്കുക"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"വൈഫൈ യുടെ ബാറ്ററി ഉപഭോഗം പരിമിതമാണ്"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi‑Fi-ക്ക് ഇന്റർനെറ്റ് ആക്സസ് നഷ്ടപ്പെട്ടാൽ, സെല്ലുലാർ ഡാറ്റയിലേക്ക് മാറുക."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"സെല്ലുലാർ ഡാറ്റ ഫോൾബാക്ക്"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"വൈഫൈയ്ക്ക് ഇന്റർനെറ്റ് ആക്സസ്സ് നഷ്ടമാകുമ്പോൾ സെല്ലുലാർ ഡാറ്റ ഉപയോഗിക്കുക. അധിക നിരക്കുകൾ ബാധകമായേക്കാം."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"നെറ്റ്‌വർക്ക് ചേർക്കുക"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"വൈഫൈ നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS പുഷ് ബട്ടൺ"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"ഈ നെറ്റ്‌വർക്കിൽ ഇന്റർനെറ്റ് ആക്‌സസ് ഇല്ല. കണക്റ്റുചെയ്ത നിലയിൽ തുടരണോ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ഈ നെറ്റ്‌വർക്കിനായി വീണ്ടും ആവശ്യപ്പെടരുത്"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"ഇന്റർനെറ്റിലേക്ക് വൈഫൈ കണക്റ്റുചെയ്‌തിട്ടില്ല"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"വൈഫൈ കണക്ഷൻ മോശമാകുമ്പോഴെല്ലാം നിങ്ങൾക്ക് സെല്ലുലാർ നെറ്റ്‌വർക്കിലേക്ക് മാറാം. ഡാറ്റ ഉപയോഗ നിരക്ക് ബാധകമായേക്കാം."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"വൈഫൈ കണക്ഷൻ മോശമാകുമ്പോഴെല്ലാം നിങ്ങൾക്ക് സെല്ലുലാർ നെറ്റ്‌വർക്കിലേക്ക് മാറാവുന്നതാണ്. ഡാറ്റ ഉപയോഗ നിരക്ക് ബാധകമായേക്കാം."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"സെല്ലുലാറിലേക്ക് മാറുക"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"വൈഫൈയിൽ തുടരുക"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"ഒരിക്കലും വീണ്ടും കാണിക്കരുത്"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"കണക്റ്റുചെയ്യുക"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്സ്"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"ചാനലുകൾ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ഈ അപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"എല്ലാം തടയുക"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"ഈ ചാനലിൽ നിന്നുള്ള അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ശല്യപ്പെടുത്തരുത്\' അസാധുവാക്കുക"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\'മുൻഗണനയുള്ളവ മാത്രം\' എന്നതിലേക്ക് \'ശല്യപ്പെടുത്തരുത്\' സജ്ജമാക്കിയിട്ടുള്ളപ്പോൾ തടസ്സപ്പെടുത്തുന്നത് തുടരാൻ ഈ അറിയിപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ലോക്ക് സ്ക്രീനിൽ"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"സെൻസി‌റ്റീവ്"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"പൂർത്തിയായി"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"പ്രാധാന്യം"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"എല്ലായ്പ്പോഴും അറിയിപ്പ് ലൈറ്റ് പ്രകാശിപ്പിക്കുക"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"എല്ലായ്പ്പോഴും വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"നയത്തിന്റെ പേര്"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"നയത്തിന്റെ പേര് നൽകുക"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"നയത്തിന്റെ പേര് ഇപ്പോൾ ഉപയോഗത്തിലുണ്ട്"</string>

diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index af81b98..df61473 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml

@@ -345,7 +345,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फिंगरप्रिंटने अनलॉक करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"आपले फिंगरप्रिंट वापरा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरेदी अधिकृत करण्यासाठी किंवा अ‍ॅप्समध्ये साइन इन करण्यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. एक जोडलेले मुद्रण देखील यापैकी काहीही करू शकते.\n\nटीप: हे डिव्हाइस अनलॉक करण्यासाठी आपण आपले फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरेदी अधिकृत करण्यासाठी किंवा अ‍ॅप्समध्ये साइन इन करण्यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. आपण जोडलेले एक प्रिंट देखील यापैकी काहीही करू शकते.\n\nटीप: हे डिव्हाइस अनलॉक करण्यासाठी आपण आपले फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो.\n\nटीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"सुरु ठेवा"</string>
@@ -1137,7 +1137,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"इतर"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टीम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्यमध्ये अ‍ॅप्सद्वारे जतन केलेल्या शेअर केलेल्या फायली, इंटरनेट किंवा Bluetooth वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\nया <xliff:g id="NAME">^1</xliff:g> ची दृश्यमान सामग्री पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्यमध्ये अ‍ॅप्सद्वारे जतन केलेल्या सामायिक केलेल्या फायली, इंटरनेट किंवा ब्लूटुथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n<xliff:g id="NAME">^1</xliff:g> ची दृश्यमान सामग्री पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"सिस्टममध्ये अशा फायलींचा समावेश आहेत ज्या Android वैयक्तिकरित्या प्रदर्शित करू शकत नाही."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="SIZE">^2</xliff:g> संचयन घेत असलेले फोटो, संगीत, चित्रपट, अ‍ॅप्स किंवा अन्य डेटा <xliff:g id="USER_0">^1</xliff:g> नी जतन केला असू शकतो. \n\nतपशील पाहण्‍यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"आपले <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c91e60d..6895e49 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimer batteribruk når Wi-Fi er på"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Begrens batteribruk for Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Bytt til mobildata hvis Wi‑Fi mister Internett-tilgang."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobildata som sikring"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Bruk mobildata når Wi-Fi mister Internett-tilgangen. Ytterligere avgifter kan påløpe."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-nettverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-knapp"</string>
@@ -767,11 +765,10 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Dette nettverket har ikke Internett-tilgang. Vil du fortsette å være koblet til nettverket?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ikke spør igjen for dette nettverket"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi er ikke koblet til Internett"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kan bytte til mobilnettverk når Wi-Fi-forbindelsen er dårlig. Datakostnader kan påløpe."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Bytt til mobilnettverk"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Aldri vis dette igjen"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kan bytte til mobilnettverket når du har dårlig Wi-Fi-tilkobling. Databruk kan påløpe."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Bytt til mobilnettet"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Bli værende på Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ikke vis igjen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
@@ -2129,7 +2126,7 @@
     <string name="finish_button_label" msgid="481587707657751116">"Fullfør"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Vil du fjerne kontoen?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Hvis du fjerner denne kontoen, slettes alle tilhørende meldinger, kontakter og andre data fra nettbrettet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Hvis du fjerner denne kontoen, slettes alle tilhørende e-poster, kontakter og andre data fra telefonen!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Hvis du fjerner denne kontoen, slettes alle tilhørende e-poster, kontakter og andre data fra telefonen."</string>
     <string name="remove_account_failed" msgid="6980737964448187854">"Denne endringen er ikke tillatt av administratoren"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanaler"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldri varsler fra denne appen"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokkér alle"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Vis aldri varsler fra denne kanalen"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Overstyr Ikke forstyrr"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"La disse varslene fortsette å forstyrre når Ikke forstyrr er angitt til Bare prioriterte"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskjermen"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitivt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Viktighet"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"La alltid varsellampen pulsere"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrer alltid"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnavn"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Skriv inn regelnavn"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Regelnavnet er allerede i bruk"</string>

diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index e423674..04d29dc 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml

@@ -345,7 +345,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ਆਪਣੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖ਼ਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿਸ ਵਿਅਕਤੀ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਜ਼ਿਆਦਾ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਜ਼ਿਆਦਾ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਵੀ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਕਿਸੇ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ਜਾਰੀ ਰੱਖੋ"</string>
@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ਜਦੋਂ Wi‑Fi ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੈਟਰੀ ਵਰਤੋਂ ਘੱਟ ਕਰੋ"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸੀਮਿਤ ਬੈਟਰੀ"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"ਸੈਲਿਉਲਰ ਡੈਟਾ ਤੇ ਸਵਿਚ ਕਰੋ ਜੇਕਰ Wi‑Fi ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਨਸ਼ਟ ਕਰ ਦਿੰਦਾ ਹੈ।"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"ਸੈਲਿਊਲਰ ਡੈਟਾ ਫ਼ੋਲਬੈਕ"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"ਜਦ ਵੀ Wi‑Fi \'ਤੇ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਗੁੰਮ ਹੋ ਜਾਵੇ ਤਾਂ ਸੈਲਿਊਲਰ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਵਾਧੂ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ਪੁਸ਼ ਬਟਨ"</string>
@@ -766,12 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"ਇਸ ਨੈੱਟਵਰਕ ਦੀ ਕੋਈ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ। ਕੀ ਕਨੈਕਟ ਰਹਿਣਾ ਹੈ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ਇਸ ਨੈੱਟਵਰਕ ਲਈ ਦੁਬਾਰਾ ਨਾ ਆਖੋ"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"ਜਦ ਵੀ Wi-Fi ਕਨੈਕਸ਼ਨ ਖਰਾਬ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਬਦਲੀ ਕਰਕੇ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ ’ਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਲਾਗੂ ਹੋ ਸਕਦੀ ਹੈ।"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"ਜਦ ਵੀ Wi-Fi ਕਨੈਕਸ਼ਨ ਖਰਾਬ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਬਦਲੀ ਕਰਕੇ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਲਾਗੂ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"ਬਦਲੀ ਕਰਕੇ ਸੈਲਿਊਲਰ \'ਤੇ ਜਾਓ"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"ਕਦੇ ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi‑Fi \'ਤੇ ਬਣੇ ਰਹੋ"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"ਕਦੇ ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ਨੈੱਟਵਰਕ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ਭੁੱਲਣਾ"</string>
@@ -938,7 +935,7 @@
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ਸਮਾਪਤੀ ਸਮਾਂ"</string>
     <string name="night_display_summary_off" msgid="7009821232380000786">"ਬੰਦ। <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਨਹੀਂ ਚਾਲੂ ਹੋਵੇਗੀ।"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ।"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"ਸੂਰਜ ਡੁੱਬਣ ਸਮੇਂ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ।"</string>
     <string name="night_display_summary_on" msgid="6626224414971753417">"ਚਾਲੂ। <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1140,7 +1137,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"ਹੋਰ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ਸਿਸਟਮ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ਐਕਸਪਲੋਰ ਕਰੋ"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ਹੋਰਾਂ ਵਿੱਚ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਕੀਤੀਆਂ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ। \n\nਇਸ <xliff:g id="NAME">^1</xliff:g> ਦੀਆਂ ਦ੍ਰਿਸ਼ਮਾਨ ਸਮੱਗਰੀਆਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਪੜਚੋਲ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ਹੋਰਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, Android ਫ਼ਾਈਲਾਂ, ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ। \n\nਇਸ <xliff:g id="NAME">^1</xliff:g> ਦੀਆਂ ਦਿਖਣਯੋਗ ਸਮੱਗਰੀਆਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਪੜਚੋਲ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"ਸਿਸਟਮ ਵਿੱਚ ਅਜਿਹੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ ਜਿੰਨ੍ਹਾਂ ਨੂੰ Android ਵਿਅਕਤੀਗਤ ਤੌਰ \'ਤੇ ਨਹੀਂ ਵਿਖਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ ਫੋਟੋਆਂ, ਸੰਗੀਤ, ਮੂਵੀਜ, ਐਪਸ ਜਾਂ ਹੋਰ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਲੈ ਰਿਹਾ ਹੈ। \n\n ਵੇਰਵੇ ਦੇਖਣ ਲਈ, <xliff:g id="USER_1">^1</xliff:g> ਤੇ ਸਵਿਚ ਕਰੋ।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਿਤ ਐਪਸ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"ਚੈਨਲ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲੌਕ ਕਰੋ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ਇਸ ਐਪ ਤੋਂ ਕਦੇ ਵੀ ਸੂਚਨਾਵਾਂ ਨਾ ਦਿਖਾਓ"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"ਸਭ ਬਲੌਕ ਕਰੋ"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"ਇਸ ਚੈਨਲ ਤੋਂ ਕਦੇ ਵੀ ਸੂਚਨਾਵਾਂ ਨਾ ਵਿਖਾਓ"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਿਰਫ਼ ਤਰਜੀਹ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ਸੰਵੇਦਨਸ਼ੀਲ"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ਹੋ ਗਿਆ"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"ਮਹੱਤਤਾ"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"ਸੂਚਨਾ ਬੱਤੀ ਨੂੰ ਹਮੇਸ਼ਾ ਜਗਮਗਾਓ"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"ਹਮੇਸ਼ਾ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"ਨਿਯਮ ਦਾ ਨਾਮ"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"ਨਿਯਮ ਦਾ ਨਾਂ ਦਾਖ਼ਲ ਕਰੋ"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"ਨਿਯਮ ਦਾ ਨਾਂ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਉਪਯੋਗ ਵਿੱਚ ਹੈ"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 83e8618..c76253c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -703,10 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizuj zużycie baterii po włączeniu Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit użycia baterii dla Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Przełącz na dane komórkowe, jeśli Wi-Fi utraci dostęp do internetu."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Zastępcza komórkowa transmisja danych"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Używaj komórkowej transmisji danych, gdy sieć Wi-Fi utraci dostęp do internetu. Mogą obowiązywać dodatkowe opłaty."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Sieci Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Przycisk WPS"</string>
@@ -784,12 +782,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POŁĄCZ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ta sieć nie ma dostępu do internetu. Nadal chcesz się z nią łączyć?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nie pytaj ponownie o tę sieć"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieć Wi‑Fi nie jest połączona z internetem"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Gdy jakość połączenia Wi-Fi będzie słaba, możesz przełączyć się na sieć komórkową. Pamiętaj, że mogą zostać naliczone opłaty za transmisję danych."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Przełącz na sieć komórkową"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nie pokazuj ponownie"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieć Wi-Fi nie jest połączona z internetem"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za transmisję danych."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Przełącz na komórkową"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Pozostań przy Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nie pokazuj już nigdy"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
@@ -2704,14 +2701,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostęp do „Nie przeszkadzać”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanały"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nigdy nie pokazuj powiadomień z tej aplikacji"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokuj wszystkie"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nigdy nie pokazuj powiadomień z tego kanału"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zastąp Nie przeszkadzać"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Zezwól na działanie tych powiadomień, gdy Nie przeszkadzać ma ustawienie Tylko priorytetowe"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na ekranie blokady"</string>
@@ -2720,10 +2714,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Poufne"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotowe"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Ważność"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Zawsze pulsująca dioda"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Zawsze wibracja"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nazwa reguły"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Wpisz nazwę reguły"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nazwa reguły jest już używana"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f2c6bdb..b28dec9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -936,11 +936,11 @@
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de fim"</string>
     <string name="night_display_summary_off" msgid="7009821232380000786">"Desativada. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca ativar automaticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ativar automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ativar automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Ativar automaticamente ao pôr do sol."</string>
     <string name="night_display_summary_on" msgid="6626224414971753417">"Ativada. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca desativar automaticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Desativar automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Desativar automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Desativar automaticamente ao nascer do sol."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"O ecrã desliga-se"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d851d8a..0ffdc56 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -694,10 +694,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Reduceți la minimum utilizarea bateriei când rețeaua Wi-Fi este activată"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit. baterie util. de Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Comutați la datele mobile dacă rețeaua Wi-Fi pierde accesul la internet."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Date mobile ca alternativă"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Folosiți datele mobile când rețeaua Wi-Fi pierde accesul la internet. Este posibil să se aplice taxe suplimentare."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adăugați o rețea"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Rețele Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Buton WPS"</string>
@@ -775,12 +773,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAȚI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Această rețea nu are acces la internet. Se păstrează conectarea?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nu mai întreba pentru această rețea"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Rețeaua Wi-Fi nu este conectată"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Rețeaua Wi-Fi nu este conectată la internet."</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Puteți comuta la rețeaua mobilă când conexiunea Wi-Fi este slabă. Este posibil să se aplice taxe pentru utilizarea datelor."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Comutați la rețeaua mobilă"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nu mai afișa"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Rămâneți pe Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nu afișa din nou"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectați-vă"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la rețea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminați"</string>
@@ -1125,7 +1122,7 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Spațiu de stocare portabil"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"Folosit: <xliff:g id="USED">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Folosit din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"Folosiți din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_volume_used_total" msgid="6113121714019000244">"Total folosit din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> este montată"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g> nu a putut fi montată"</string>
@@ -1150,7 +1147,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Altele"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorați <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Pot fi incluse fișiere trimise care au fost salvate de aplicații, fișiere descărcate de pe internet sau prin Bluetooth, fișiere Android și altele. \n\nPentru a vedea conținutul vizibil al stocării <xliff:g id="NAME">^1</xliff:g>, atingeți Explorați."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"În „Altele” sunt incluse fișiere trimise care au fost salvate de aplicații, fișiere descărcate de pe internet sau prin Bluetooth, fișiere Android și altele. \n\nPentru a accesa conținutul vizibil al stocării <xliff:g id="NAME">^1</xliff:g>, atingeți Explorați."</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistemul include fișiere pe care Android nu le poate afișa individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Este posibil ca <xliff:g id="USER_0">^1</xliff:g> să fi salvat fotografii, muzică, filme, aplicați sau alte date care ocupă <xliff:g id="SIZE">^2</xliff:g> din spațiul de stocare. \n\nPentru a vedea detaliile, comutați la <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurați <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -2682,14 +2679,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesul Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Canale"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nu afișați notificări de la această aplicație"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blocați-le pe toate"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nu se afișează niciodată notificări de la acest canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoră Nu deranja"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permiteți acestor notificări să vă întrerupă când modul Nu deranja este setat la Numai cu prioritate"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pe ecranul de blocare"</string>
@@ -2698,10 +2692,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidențial"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminat"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importanță"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Indicator luminos intermitent activ mereu"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrează întotdeauna"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Numele regulii"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Introduceți numele regulii"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Numele regulii este deja folosit"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8d78536..1e1d633 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -703,10 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Экономить заряд батареи, когда используется Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Лимит расхода батареи (Wi‑Fi)"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Подключаться к моб. сети, если нет Интернета через Wi-Fi"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Переключаться на мобильную сеть"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Использовать мобильные данные при отсутствии интернет-подключения по Wi‑Fi (может взиматься дополнительная плата)"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавить сеть"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Сети Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
@@ -787,8 +785,7 @@
     <string name="lost_internet_access_title" msgid="6228530645663584505">"В этой сети Wi-Fi нет доступа к Интернету"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Вы можете переключаться на мобильную сеть при слабом сигнале Wi‑Fi. Может взиматься плата за передачу данных."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Переключиться на мобильную сеть"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Не отключаться от сети Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Больше не показывать"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
@@ -2704,14 +2701,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ к функции \"Не беспокоить\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установленные приложения не требуют доступа к функции \"Не беспокоить\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Каналы"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Не показывать уведомления из этого приложения"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Блокировать все"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Не показывать уведомления о действиях на этом канале"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить режим \"Не беспокоить\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешить эти уведомления, когда в режиме \"Не беспокоить\" выбрано \"Только важные\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокированном экране"</string>
@@ -2720,10 +2714,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфиденциальные"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Важность"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Всегда использовать световой индикатор"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Всегда использовать вибросигнал"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Название правила"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Введите название правила"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Правило с таким названием уже есть"</string>
@@ -3247,8 +3239,8 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Может взиматься плата за международные звонки"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Позвонить"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Написать в чате"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Изучите наши рекомендации"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Выполните поиск по Справочному центру и отправьте отзыв"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Рекомендации и полезные советы"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Справочный центр / Оставить отзыв"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Свяжитесь со службой поддержки"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Войти"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не удается войти"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 20b6917..170b559 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -703,10 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Obmedz. využitie batérie sieťou Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Prepínať na mobilné pripojenie, keď sieť Wi‑Fi nebude mať pripojenie k internetu"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Prepnutie na mobilné dáta"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Použiť mobilné dáta, keď sieť Wi‑Fi nebude mať pripojenie k internetu. Môžu vám byť účtované ďalšie poplatky"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
@@ -784,12 +782,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIPOJIŤ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Táto sieť nemá prístup k internetu. Chcete k nej zostať pripojený/-á?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nabudúce sa na túto sieť nepýtať"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi nemá pripojenie na internet"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Vždy, keď má Wi-Fi zlé pripojenie, môžete prepnúť na mobilnú sieť. Využitie dát môže byť spoplatnené."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieť Wi-Fi nie je pripojená k internetu"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Ak má Wi-Fi slabé spojenie, môžete prepnúť na mobilnú sieť. Za využité dáta vám však môžu byť účtované poplatky."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Prepnúť na mobilné dáta"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"V budúcnosti už nikdy nezobrazovať"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ďalej používať Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Viac už nezobrazovať"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
@@ -2704,14 +2701,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prístup k nastaveniu Nerušiť"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Prístup k nastaveniu Nerušiť si nevyžiadali žiadne nainštalované aplikácie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanály"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovať upozornenia z tejto aplikácie"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokovať všetko"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nikdy nezobrazovať upozornenia z tohto kanála"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prepísať možnosť Nerušiť"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožniť týmto upozorneniam vyrušiť ma, ak je možnosť Nerušiť nastavená na možnosť Iba prioritné"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na uzamknutej obrazovke"</string>
@@ -2720,10 +2714,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Dôležitosť"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Vždy blikať kontrolkou upozornenia"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vždy vibrovať"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Názov pravidla"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Zadajte názov pravidla"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Názov pravidla sa už používa"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 999d1fb..1c49729 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -703,10 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Zmanjšanje porabe energije akumulatorja, ko je vklopljen Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Omejitev porabe akum. za Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Preklop na prenos podatkov v mobilnem omrežju, če povezava Wi‑Fi nima več internetnega dostopa"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Nadomestni prenos podatkov v mobilnih omrežjih"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Uporaba prenosa podatkov v mobilnem omrežju, ko povezava Wi‑Fi izgubi dostop do interneta. Prenos podatkov v mobilnih omrežjih se lahko zaračuna posebej."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj omrežje"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Omrežja Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Gumb za WPS"</string>
@@ -784,11 +782,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"POVEŽI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"To omrežje nima dostopa do interneta. Ali želite ostati povezani?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne sprašuj več za to omrežje"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Dostop do interneta prek omrežja Wi-Fi ni na voljo"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Kadar je povezava Wi-Fi nezanesljiva, lahko preklopite na mobilno omrežje. Pri tem bodo morda nastali stroški prenosa podatkov v mobilnih omrežjih."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Preklop na mobilno omrežje"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Omrežje Wi-Fi ni povezano z internetom"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Kadar je povezava Wi-Fi slaba, lahko preklopite na mobilno omrežje. Pri tem bodo morda nastali stroški prenosa podatkov v mobilnih omrežjih."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Preklopi na mobilno omrežje"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ostani v omrežju Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Tega ne prikaži nikoli več"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
@@ -2704,14 +2701,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanali"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikoli ne pokaži obvestil te aplikacije"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokiraj vse"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nikoli ne pokaži obvestil tega kanala"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Preglasitev načina »Ne moti«"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Naj se ta obvestila prikazujejo tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaklenjenem zaslonu"</string>
@@ -2720,10 +2714,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Občutljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Končano"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Pomembnost"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Vedno utripanje lučke za obvestila"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vedno vibriranje"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ime pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Vnesite ime pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ime pravila je že uporabljeno"</string>

diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 8085dc2..48fcf65 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml

@@ -765,10 +765,10 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ky rrjet nuk ka qasje në internet. Qëndro i lidhur?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Mos pyet përsëri për këtë rrjet"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi nuk është i lidhur me internetin"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Mund të kalosh në rrjetin celular sa herë që Wi‑Fi ka një lidhje të keqe. Mund të zbatohen tarifa për përdorimin e të dhënave."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Kalo në rrjetin celular"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Mund të kalosh në rrjetin celular sa herë që Wi‑Fi ka lidhje të keqe. Mund të zbatohen tarifa për përdorimin e të dhënave."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Kalo në celular"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Qëndro në Wi‑Fi"</string>
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Mos e shfaq më asnjëherë"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Kurrë mos e trego përsëri"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Lidh"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Lidhja me rrjetin dështoi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Harro"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4ad21a5..b8f03b0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -694,10 +694,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Смањи коришћење батерије када је Wi-Fi укључен"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Огран. бат. коју користи Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Пређи на податке за мобилне уређаје ако Wi‑Fi изгуби приступ интернету."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Прелазак на мобилне податке"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Користите мобилне податке када Wi‑Fi изгуби приступ интернету. Могу да се наплаћују додатне накнаде."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додај мрежу"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi мреже"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS дугме"</string>
@@ -775,12 +773,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ПОВЕЖИ СЕ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ова мрежа нема приступ интернету. Желите ли да останете повезани?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Не питај поново за ову мрежу"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi мрежа није повезана са интернетом"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi мрежа није повезана са интернетом"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Можете да пређете на мобилну мрежу кад год је Wi‑Fi веза лоша. Може да вам буде наплаћен пренос података."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Пређи на мобилну мрежу"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Не приказуј никада више"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Остани на Wi‑Fi-ју"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Не приказуј поново"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -2040,7 +2037,7 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"Резервне копије и ресетовање"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервна копија и ресетовање"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични подаци"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Прављење резервних копија мојих података"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Прављење резервних копија података"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Прави резервне копије података о апликацијама, Wi-Fi лозинки и других подешавања на Google серверима"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Резервна копија налога"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Уврштавање података апликација"</string>
@@ -2682,14 +2679,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Приступ опцији Не узнемиравај"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниједна инсталирана апликација није захтевала приступ опцији Не узнемиравај"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавају се апликације..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Канали"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никада не приказуј обавештења из ове апликације"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Блокирај све"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Никада не приказуј обавештења са овог канала"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Замени режим Не узнемиравај"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Омогућава да ова обавештења наставе да се приказују када је режим Не узнемиравај подешен на опцију Само приоритетни прекиди"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На закључаном екрану"</string>
@@ -2698,10 +2692,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Осетљиво"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Важност"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Увек активирај пулсирајућу лампицу за обавештења"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Увек вибрирај"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Назив правила"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Унесите назив правила"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Назив правила се већ користи"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 40a6083..df6ccf9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimera batterianvändningen när Wi-Fi är aktiverat"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Batterianvänd.gräns för Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Byt till mobildata om jag förlorar internetåtkomsten via Wi-Fi."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Använd mobildata som reserv"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Använd mobildata när du förlorar internetanslutningen via Wi‑Fi. Ytterligare avgifter kan tillkomma."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lägg till nätverk"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-nätverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-tryckknapp"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ANSLUT"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Nätverket är inte anslutet till internet. Vill du fortsätta använda nätverket?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Fråga inte igen för det här nätverket"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Detta Wi‑Fi är inte anslutet till internet."</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kan växla till mobilnätet när det är dålig anslutning via Wi‑Fi. Dataförbrukningsavgifter kan förekomma."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Ingen internetanslutning med Wi-Fi"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Du kan byta till mobilnätet när Wi-Fi-anslutningen är dålig. Avgifter för dataförbrukning kan tillkomma."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Byt till mobilnät"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Fortsätt på Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Visa aldrig igen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Stör ej-åtkomst"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Inga installerade appar har begärt Stör ej-åtkomst"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanaler"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Visa aldrig aviseringar från den här appen"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blockera alla"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Visa aldrig aviseringar från den här kanalen"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Åsidosätt Stör ej"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Fortsätt att få dessa aviseringar när Endast prioriterade har angetts för Stör ej"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låsskärmen"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Känsligt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klart"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Relevans"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Använd alltid blinkande ljusavisering"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrera alltid"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnamn"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ange namn på regel"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Regelnamnet används redan"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f281f04..697e0ee 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -345,9 +345,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Fungua kwa kitambulisho"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Tumia alama yako ya kidole"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Tumia alama ya kidole chako"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Gusa tu kitambua alama ya kidole ili ufungue simu yako, uthibitishe ununuzi au uingie katika akaunti za programu. Kuwa makini unapoongeza alama za vidole. Alama yoyote kidole unayoongeza inaweza kufanya shughuli hizi.\n\nKumbuka: Huenda PIN au mchoro thabiti ukawa salama zaidi kuliko alama ya kidole."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Ili kuidhinisha ununuzi, gusa kitambua alama ya kidole au uingie katika akaunti za programu. Kuwa mwangalifu unapoongeza alama za vidole. Alama moja ya kidole unayoongeza inaweza kufanya mambo haya.\n\nKumbuka: Huwezi kutumia alama yako ya kidole kufungua kifaa hiki. Wasiliana na msimamizi wa shirika lako kwa maelezo zaidi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Ili kuidhinisha ununuzi, gusa kitambua alama ya kidole au uingie katika akaunti ya programu. Kuwa mwangalifu unapoongeza alama za vidole. Alama moja ya kidole unayoongeza inaweza kufanya mambo haya.\n\nKumbuka: Huwezi kutumia alama ya kidole chako kufungua kifaa hiki. Wasiliana na msimamizi wa shirika lako kwa maelezo zaidi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Gusa tu kitambua alama ya kidole ili ufungue simu yako, uthibitishe ununuzi au uingie katika programu. Kuwa makini unapoongeza alama ya kidole . Alama yoyote ya kidole unayoongeza inaweza kufanya shughuli hizi. \n\nKumbuka: Huenda PIN au mchoro thabiti ukawa salama zaidi kuliko alama ya kidole."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ghairi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Endelea"</string>
@@ -769,7 +769,7 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Mtandao huu hauna Intaneti. Ungetaka kuunganishwa?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Usiulizie mtandao huu tena"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi haijaunganishwa kwenye Intaneti"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"Unaweza kubadili utumie data ya mtandao wa simu wakati wowote Wi-Fi inapokuwa na muunganisho mbaya. Huenda ukatozwa ada ya kutumia data."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Unaweza kubadili utumie data ya mtandao wa simu wakati wowote Wi-Fi inapokuwa na muunganisho mbaya. Huenda data ikatumika."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Badili utumie data ya mtandao wa simu"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Endelea kutumia Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Usionyeshe tena"</string>
@@ -1141,7 +1141,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Nyingine"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Mfumo"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Gundua <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gonga Gundua."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Faili nyingine zilizopo ni kama vile faili zilizohifadhiwa na programu, faili zilizopakuliwa kutoka kwenye Intaneti au Bluetooth, faili za Android, na kadhalika.\n\nIli kuona maudhui ya <xliff:g id="NAME">^1</xliff:g> yanayoweza kuonekana, gonga Gundua."</string>
     <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Mfumo unajumuisha faili ambazo Android haiwezi kuonyesha moja moja."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Huenda <xliff:g id="USER_0">^1</xliff:g> amehifadhi picha, muziki, filamu, programu, au data nyingine inayotumia nafasi ya <xliff:g id="SIZE">^2</xliff:g> ya hifadhi. \n\n Ili uweze kutazama maelezo, badilisha hadi <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>

diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index e9aa6250..5c22759 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"வைஃபையை இயக்கத்தில் இருக்கும்போது பேட்டரி பயன்பாட்டைக் குறை"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"வைஃபை இன் பேட்டரி பயன்பாட்டை வரம்பிடு"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"வைஃபையில் இணைய அணுகல் இல்லை எனில், செல்லுலார் தரவிற்கு மாறவும்."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"செல்லுலார் தரவிற்கு மாறுதல்"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"வைஃபையானது இணைய அணுகலை இழக்கும் போது, செல்லுலார் தரவைப் பயன்படுத்தவும். கூடுதல் கட்டணங்கள் விதிக்கப்படலாம்."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"நெட்வொர்க்கைச் சேர்"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"வைஃபை நெட்வொர்க்குகள்"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS புஷ் பொத்தான்"</string>
@@ -767,10 +765,9 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"இந்த நெட்வொர்க்கில் இணைய அணுகல் இல்லை. இணைந்திருக்கவா?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"இந்த நெட்வொர்க்கை மீண்டும் உறுதிப்படுத்தக் கேட்காதே"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"வைஃபையில் இணைய இணைப்பு இல்லை"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"வைஃபை இணைப்பின் வேகம் மோசமாக இருக்கும் போது, செல்லுலார் நெட்வொர்க்குக்கு மாற்றிக்கொள்ளலாம். தரவு பயன்படுத்தப்படலாம்."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"வைஃபை இணைப்பு மோசமாக இருக்கும் போது, செல்லுலார் நெட்வொர்க்குக்கு மாற்றிக்கொள்ளலாம். தரவு பயன்படுத்தப்படலாம்."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"செல்லுலாருக்கு மாறு"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"வைஃபையில் தொடர்க"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"இனி ஒருபோதும் காட்டாதே"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"இணை"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகல்"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"சேனல்கள்"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"இந்தப் பயன்பாட்டிலிருந்து எப்போதும் அறிவிப்புகளைக் காட்டாதே"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"எல்லாம் தடு"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"இந்தச் சேனலிலிருந்து ஒருபோதும் அறிவிப்புகளைக் காட்டாதே"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"பூட்டுத் திரையில்"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"முக்கியமானவை"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"முடிந்தது"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"முக்கியத்துவம்"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"அறிவிப்பு ஒளியை எப்போதும் இயக்கு"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"எப்போதும் அதிர்வுறு"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"விதியின் பெயர்"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"விதியின் பெயரை உள்ளிடு"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"விதியின் பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 14667cd..71fe8bb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ลดการใช้แบตเตอรี่เมื่อ WiFi เปิดอยู่"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"จำกัดแบตเตอรี่ที่ใช้โดย Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"สลับไปใช้ข้อมูลมือถือหาก Wi-Fi ไม่สามารถเข้าถึงอินเทอร์เน็ตได้"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"ใช้ข้อมูลเครือข่ายมือถือเป็นทางเลือกสำรอง"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"ใช้ข้อมูลเครือข่ายมือถือเมื่อ Wi-Fi เชื่อมต่ออินเทอร์เน็ตไม่ได้ อาจมีค่าบริการเพิ่มเติม"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"เพิ่มเครือข่าย"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"เครือข่าย WiFi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"ปุ่มกด WPS"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"เชื่อมต่อ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"เครือข่ายนี้ไม่มีการเข้าถึงอินเทอร์เน็ต ต้องการเชื่อมต่ออยู่ไหม"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ไม่ต้องถามอีกสำหรับเครือข่ายนี้"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi ไม่ได้เชื่อมต่ออินเทอร์เน็ต"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"คุณสามารถสลับไปยังเครือข่ายมือถือเมื่อใดก็ตามที่ Wi-Fi มีการเชื่อมต่อแย่ อาจมีค่าบริการตามปริมาณการใช้อินเทอร์เน็ต"</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"สลับไปยังเครือข่ายมือถือ"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi ไม่ได้เชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"คุณสลับไปใช้เครือข่ายมือถือได้เมื่อการเชื่อมต่อ Wi-Fi มีสัญญาณไม่ดี อาจมีค่าบริการตามปริมาณการใช้อินเทอร์เน็ต"</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"สลับไปใช้เครือข่ายมือถือ"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"ใช้ Wi-Fi ต่อไป"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"ไม่ต้องแสดงอีก"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"ช่อง"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ไม่ต้องแสดงการแจ้งเตือนจากแอปนี้"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"บล็อกทั้งหมด"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"ไม่ต้องแสดงการแจ้งเตือนจากช่องนี้"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ลบล้างห้ามรบกวน"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"อนุญาตให้แสดงการแจ้งเตือนเหล่านี้ต่อไปเมื่อตั้งค่าห้ามรบกวนเป็นเฉพาะเรื่องสำคัญเท่านั้น"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"บนหน้าจอล็อก"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ละเอียดอ่อน"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"เสร็จสิ้น"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"ความสำคัญ"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"แสดงไฟกะพริบแจ้งเตือนทุกครั้ง"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"สั่นทุกครั้ง"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"ชื่อกฎ"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"ป้อนชื่อกฎ"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"มีการใช้ชื่อกฎนี้แล้ว"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 41ceeb5..734e5fd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Kablosuz açıkken pil kullanımını en aza indir"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Kablosuz\'un kullandığı pili sınırlandırın"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Kablosuz bağlantının İnternet erişimi kesilirse hücresel veriye geç."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Hücresel veriye geri dön"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Kablosuz ağın İnternet erişimi kesilirse hücresel veri kullan. Ek ücretler geçerli olabilir."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ağ ekle"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Kablosuz ağlar"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Düğmesi"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"BAĞLAN"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Bu ağda İnternet erişimi yok. Bağlı kalınsın mı?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Bu ağ için bir daha sorma"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Kablosuz ağ, İnternet\'e bağlı değil"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Kablosuz ağ İnternet\'e bağlı değil"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Kablosuz ağın İnternet bağlantısı sorunlu olduğunda hücresel ağa geçiş yapabilirsiniz. Veri kullanımı söz konusu olabilir."</string>
-    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Hücresel ağa geçin"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Hücresel ağa geç"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Kablosuz bağlantıda kal"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Bir daha gösterme"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yüklü hiçbir uygulama Rahatsız Etmeyin erişimi isteğinde bulunmadı"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanallar"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Bu uygulamadan gelen bildirimleri asla gösterme"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Tümünü engelle"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Bu kanaldan gelen bildirimleri asla gösterme"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Rahatsız Etmeyin ayarını geçersiz kıl"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Rahatsız Etmeyin seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken, bu bildirimlerin kesmeye devam etmesine izin ver"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Kilit ekranında"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Hassas"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tamam"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Önem"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Bildirim ışığı her zaman yanıp sönsün"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Her zaman titreştir"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Kural adı"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Kural adı girin"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Kural adı zaten kullanılıyor"</string>

diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 837537e..33b6199 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml

@@ -675,10 +675,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"‏Wi‑Fi آن ہونے پر بیٹری کے استعمال کو کم کریں"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"‏Wi‑Fi کے ذریعے مستعمل بیٹری محدود کریں"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"‏Wi‑Fi پر انٹرنیٹ رسائی ختم ہونے پر سیلولر ڈیٹا میں سوئچ کریں۔"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"سیلولر ڈیٹا فال بیک"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"‏Wi-Fi پر انٹرنیٹ رسائی ختم ہونے پر سیلولر ڈیٹا استعمال کریں۔ اضافی چارجز لاگو ہو سکتے ہیں۔"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"نیٹ ورک شامل کریں"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"‏Wi‑Fi نیٹ ورکس"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"‏WPS پش بٹن"</string>
@@ -756,11 +754,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"مربوط کریں"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"اس نیٹ ورک کو انٹرنیٹ تک رسائی نہیں ہے۔ منسلک رہیں؟"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"اس نیٹ ورک کیلئے دوبارہ نہ پوچھیں"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"‏Wi‑Fi انٹرنیٹ سے منسلک نہیں ہے"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏Wi‑Fi کا کنکشن خراب ہونے پر آپ سیلولر نیٹ ورک پر سوئچ کر سکتے ہیں۔ ڈیٹا کا استعمال لاگو ہو سکتا ہے۔"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"‏Wi-Fi انٹرنیٹ سے منسلک نہیں ہے"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"‏جب بھی Wi-Fi کنکشن خراب ہو آپ سیلولر نیٹ ورک پر سوئچ کر سکتے ہیں۔ ڈیٹا کے استعمال کا اطلاق ہو سکتا ہے۔"</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"سیلولر پر سوئچ کریں"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"‏Wi-Fi پر رہیں"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"دوبارہ کبھی نہ دکھائیں"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"مربوط کریں"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"نیٹ ورک سے مربوط ہونے میں ناکام رہا"</string>
@@ -2650,14 +2647,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"چینلز"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"اس ایپ سے کبھی بھی اطلاعات نہ دکھائیں"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"سبھی کو مسدود کریں"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"اس چینل سے کبھی بھی اطلاعات نہ دکھائیں"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ڈسٹرب نہ کریں کو اوور رائیڈ کریں"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"جب \'ڈسٹرب نہ کریں\' صرف ترجیح پر سیٹ ہو تو ان اطلاعات کو مداخلت کرنے دیں"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"قفل اسکرین پر"</string>
@@ -2666,10 +2660,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ہوگیا"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"اہمیت"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"ہمیشہ اطلاعی روشنی جھپکائیں"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"ہمیشہ وائبریٹ کریں"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"اصول کا نام"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"اصول کا نام درج کریں"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"اصول نام پہلے ہی زیر استعمال ہے"</string>

diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index a60febf..65d9a58 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi yoqilganda batareya sarfini kamaytirish"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Quvvat sarfini cheklash (Wi-Fi)"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Agar Wi-Fi tarmog‘ida internet uzilib qolsa, mobil internetga ulansin."</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Zaxira sifatida mobil internetdan foydalanish"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Agar Wi-Fi tarmog‘ida internet uzilib qolsa, mobil internetdan foydalaning. Qo‘shimcha to‘lovlar olinishi mumkin."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tarmoq qo‘shish"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi tarmoqlari"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS tugmasi"</string>
@@ -769,8 +767,7 @@
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi aloqasi bor, lekin Internetga ulanmagan"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"Agar Wi-Fi signali yomon bo‘lsa, istalgan vaqtda mobil internetga o‘tishingiz mumkin. Sarflangan trafik uchun haq olinishi mumkin."</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"Mobil internetga o‘tish"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi tarmog‘ida qoling"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Boshqa ko‘rsatilmasin"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ulanish"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Tarmoqqa ulanmadi"</string>
@@ -1009,7 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versiyasi"</string>
     <string name="security_patch" msgid="8438384045870296634">"Xavfsizlik tizimi yangilanishi"</string>
-    <string name="model_info" msgid="1952009518045740889">"Modeli"</string>
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Jihozning nomi"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Aloqa moduli versiyasi"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Yadro versiyasi"</string>
@@ -2660,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“Bezovta qilinmasin” fuksiyasi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"Kanallar"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Barchasini bloklash"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ushbu ilovadan keladigan bildirishnomalar hech qachon ko‘rsatilmasin"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Barchasini bloklash"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Ushbu kanaldan keladigan bildirishnomalar hech qachon ko‘rsatilmasin"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"“Bezovta qilinmasin” rejimini qayta o‘rnatish"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"“Bezovta qilinmasin” rejimi “Faqat muhim bildirishnomalar” uchun istisno qilingan holatda ushbu bildirishnomalar ham ko‘rsatilsin."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Qulflangan ekranda"</string>
@@ -2676,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Maxfiy"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tayyor"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Muhimligi"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Doim yoritkichli indikator yoqilsin"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Doim tebranilsin"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Qoida nomi"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Qoida nomini kiriting"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Bunday nom avval ishlatilgan"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b22c152..992d67d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -343,11 +343,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"使用指纹解锁"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_title_unlock_disabled (7066417934622827305) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"使用指纹"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只需触摸指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (4193477159493347679) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"只需触摸指纹传感器即可对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n注意：您无法使用指纹来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"只需触摸指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"继续"</string>
@@ -687,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"开启WLAN时尽可能节约电池用量"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"限制WLAN耗电量"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"在 WLAN 网络无法连接到互联网时改用移动数据网络。"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"改用移动数据网络"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"在 WLAN 网络无法连接到互联网时改用移动数据网络（可能需要支付额外的费用）。"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"添加网络"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"WLAN网络"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS按钮"</string>
@@ -768,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"连接"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"使用此网络将无法访问互联网。仍要使用此网络吗？"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"对于此网络不再询问"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"此 WLAN 网络未连接到互联网"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"此 WLAN 网络无法连接到互联网"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"当 WLAN 网络连接状况不佳时，您可以切换到移动网络（可能会消耗移动数据流量）。"</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"切换到移动网络"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"让 WLAN 保持开启状态"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"不再显示"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
@@ -867,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音乐效果"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"铃声音量"</string>
@@ -940,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"日落到日出"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"开始时间"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"结束时间"</string>
-    <!-- no translation found for night_display_summary_off (7009821232380000786) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_never (2305501561697289620) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_custom (1548073080728058384) -->
-    <skip />
-    <!-- no translation found for night_display_summary_off_auto_mode_twilight (2737328390752018845) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on (6626224414971753417) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_never (5217396859715040056) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_custom (887702685252504739) -->
-    <skip />
-    <!-- no translation found for night_display_summary_on_auto_mode_twilight (8574989770628425398) -->
-    <skip />
+    <string name="night_display_summary_off" msgid="7009821232380000786">"关闭。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"一律不自动开启。"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动开启。"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"将在日落时自动开启。"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"开启。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"一律不自动关闭。"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动关闭。"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"将在日出时自动关闭。"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"屏幕关闭"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -1020,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android 版本"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android 安全补丁程序级别"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"型号"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"设备 ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"基带版本"</string>
     <string name="kernel_version" msgid="9192574954196167602">"内核版本"</string>
@@ -1152,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"系统"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"浏览<xliff:g id="NAME">^1</xliff:g>"</string>
-    <!-- no translation found for storage_detail_dialog_other (8907101974576694793) -->
-    <skip />
-    <!-- no translation found for storage_detail_dialog_system (3417679651116003900) -->
-    <skip />
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"“其他”包括应用所保存的共享文件、通过互联网或蓝牙下载的文件、Android 文件等。\n\n要查看此<xliff:g id="NAME">^1</xliff:g>中的可见内容，请点按“浏览”。"</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"“系统”中包含 Android 无法逐个显示的文件。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>所保存的照片、音乐、电影、应用或其他数据可能占用了 <xliff:g id="SIZE">^2</xliff:g> 的存储空间。\n\n要查看详细信息，请切换到<xliff:g id="USER_1">^1</xliff:g>。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"设置您的<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"用作便携式存储设备"</string>
@@ -2674,14 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“勿扰”权限"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"没有任何已安装应用申请“勿扰”权限"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"通道"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部屏蔽"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"一律不显示来自此应用的通知"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"全部屏蔽"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"一律不显示来自此通道的通知"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆盖“勿扰”设置"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当勿扰模式设为“仅限优先打扰”时，允许这类通知继续打扰"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"屏幕锁定时"</string>
@@ -2690,10 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"敏感"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"重要程度"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"收到通知时一律让指示灯闪烁"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"一律振动"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"规则名称"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"输入规则名称"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"规则名称已被使用"</string>
@@ -3105,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"网络流量限制"</string>
     <string name="operator_warning" msgid="1862988028996859195">"运营商的流量计算方式可能与您设备的计算方式不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"设置数据用量警告"</string>
     <string name="data_warning" msgid="209133958008062117">"流量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"设置流量上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"流量上限"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a266b00..adc2a43 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時盡量節約用電"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"限制 Wi-Fi 耗電量"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"當 Wi‑Fi 無法連接至互聯網時，切換至流動數據。"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"切換至流動數據網絡"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"當 Wi‑Fi 無法連線至互聯網時，切換至流動數據網絡。可能需要支付額外費用。"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"新增網絡"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 網絡"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
@@ -766,11 +764,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"連線"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"此網絡並未連接互聯網，您仍要保持連線嗎？"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"不要再詢問我是否使用此網絡"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi 並未連接至互聯網"</string>
-    <string name="lost_internet_access_text" msgid="1676124057345106398">"當 Wi-Fi 連線速度變差時，您可切換至流動網絡 (可能需支付數據用量)。"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi 並未連線至互聯網"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi-Fi 連線欠佳時，您可以自動切換至流動網絡。可能需要耗用數據用量。"</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"切換至流動網絡"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"繼續使用 Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"不要再顯示"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連接網絡"</string>
@@ -2665,14 +2662,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"[請勿騷擾] 存取"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"沒有已安裝的應用程式要求 [請勿騷擾] 存取。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"頻道"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"全部封鎖"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"不要再顯示此頻道的通知"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"取代「請勿騷擾」"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「請勿騷擾」設定為「僅限優先」時，允許顯示這些通知"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"畫面上鎖時"</string>
@@ -2681,10 +2675,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"敏感"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"重要性"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"永遠啟用通知燈"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"永遠震動"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"規則名稱"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"輸入規則名稱"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"規則名稱已使用"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 366e40d..1fc3915 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -685,10 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時儘可能節約電池用量"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"限制 Wi-Fi 用電量"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi-Fi 網路無法連線時，切換到行動數據。"</string>
-    <!-- no translation found for wifi_cellular_data_fallback_title (341508634673327078) -->
-    <skip />
-    <!-- no translation found for wifi_cellular_data_fallback_summary (1960608487363658949) -->
-    <skip />
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"備用的行動網路"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Wi‑Fi 無法連上網際網路時，切換到行動網路 (可能需要支付相關費用)。"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"新增網路"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 網路"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
@@ -769,8 +767,7 @@
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi 無法連上網際網路"</string>
     <string name="lost_internet_access_text" msgid="1676124057345106398">"當 Wi-Fi 網路連線狀況不佳時，你可以切換到行動網路 (可能需要支付數據傳輸費用)。"</string>
     <string name="lost_internet_access_switch" msgid="1980357004205108781">"切換到行動網路"</string>
-    <!-- no translation found for lost_internet_access_cancel (338273139419871110) -->
-    <skip />
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"保持開啟 Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"不要再顯示"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
@@ -2664,14 +2661,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"零打擾存取權"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
-    <!-- no translation found for notification_channels (8681423709659818791) -->
-    <skip />
+    <string name="notification_channels" msgid="8681423709659818791">"頻道"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
-    <!-- no translation found for channel_notification_block_title (1570538726036580979) -->
-    <skip />
-    <!-- no translation found for channel_notification_block_summary (3024773079420038146) -->
-    <skip />
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"全部封鎖"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"一律不顯示這個頻道的通知"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆寫「零打擾」模式設定"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「零打擾」模式設定為「僅限優先通知」時，允許這些通知繼續干擾"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定時"</string>
@@ -2680,10 +2674,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"機密"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"重要性"</string>
-    <!-- no translation found for notification_show_lights_title (7301956309661349031) -->
-    <skip />
-    <!-- no translation found for notification_vibrate_title (4942317478973441720) -->
-    <skip />
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"一律使用閃爍燈光通知"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"一律震動"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"規則名稱"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"輸入規則名稱"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"規則名稱已在使用中"</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33903dd..893bc47 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1523,9 +1523,9 @@
     <string name="nfc_quick_toggle_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
     <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
     <string name="nfc_quick_toggle_summary" product="default">Allow data exchange when the phone touches another device</string>
-    <!-- Dialog title for NFC disclaimr [CHAR_LIMIT=40]-->
+    <!-- Dialog title for NFC disclaimer [CHAR_LIMIT=40]-->
     <string name="nfc_disclaimer_title">Turn on NFC</string>
-    <!-- Dialog title for NFC disclaimr [CHAR_LIMIT=NONE]-->
+    <!-- Dialog content for NFC disclaimer: telling user NFC can exchange data when device is nearby other devices (for example: payment terminals, badge reader etc). [CHAR_LIMIT=NONE]-->
     <string name="nfc_disclaimer_content">NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers, and interactive ads or tags.</string>
 
     <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index a9ff498..bed2083 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java

@@ -114,6 +114,7 @@
     private String mMvnoTypeStr;
     private String mMvnoMatchDataStr;
     private String[] mReadOnlyApnTypes;
+    private String[] mReadOnlyApnFields;
     private boolean mReadOnlyApn;
 
     /**
@@ -209,6 +210,7 @@
         mFirstTime = icicle == null;
         mReadOnlyApn = false;
         mReadOnlyApnTypes = null;
+        mReadOnlyApnFields = null;
 
         if (action.equals(Intent.ACTION_EDIT)) {
             Uri uri = intent.getData();
@@ -224,6 +226,8 @@
                 if (b != null) {
                     mReadOnlyApnTypes = b.getStringArray(
                             CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
+                    mReadOnlyApnFields = b.getStringArray(
+                            CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY);
                 }
             }
             mUri = uri;
@@ -274,9 +278,9 @@
             Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
             mReadOnlyApn = true;
             disableAllFields();
-        } /* else (if specific fields are read-only) {
-            disable specific fields
-        } */
+        } else if (!ArrayUtils.isEmpty(mReadOnlyApnFields)) {
+            disableFields(mReadOnlyApnFields);
+        }
 
         for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
             getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
@@ -341,6 +345,72 @@
     }
 
     /**
+     * Function to get Preference obj corresponding to an apnField
+     * @param apnField apn field name for which pref is needed
+     * @return Preference obj corresponding to passed in apnField
+     */
+    private Preference getPreferenceFromFieldName(String apnField) {
+        switch (apnField) {
+            case Telephony.Carriers.NAME:
+                return mName;
+            case Telephony.Carriers.APN:
+                return mApn;
+            case Telephony.Carriers.PROXY:
+                return mProxy;
+            case Telephony.Carriers.PORT:
+                return mPort;
+            case Telephony.Carriers.USER:
+                return mUser;
+            case Telephony.Carriers.SERVER:
+                return mServer;
+            case Telephony.Carriers.PASSWORD:
+                return mPassword;
+            case Telephony.Carriers.MMSPROXY:
+                return mMmsProxy;
+            case Telephony.Carriers.MMSPORT:
+                return mMmsPort;
+            case Telephony.Carriers.MMSC:
+                return mMmsc;
+            case Telephony.Carriers.MCC:
+                return mMcc;
+            case Telephony.Carriers.MNC:
+                return mMnc;
+            case Telephony.Carriers.TYPE:
+                return mApnType;
+            case Telephony.Carriers.AUTH_TYPE:
+                return mAuthType;
+            case Telephony.Carriers.PROTOCOL:
+                return mProtocol;
+            case Telephony.Carriers.ROAMING_PROTOCOL:
+                return mRoamingProtocol;
+            case Telephony.Carriers.CARRIER_ENABLED:
+                return mCarrierEnabled;
+            case Telephony.Carriers.BEARER:
+            case Telephony.Carriers.BEARER_BITMASK:
+                return mBearerMulti;
+            case Telephony.Carriers.MVNO_TYPE:
+                return mMvnoType;
+            case Telephony.Carriers.MVNO_MATCH_DATA:
+                return mMvnoMatchData;
+        }
+        return null;
+    }
+
+    /**
+     * Disables given fields so that user cannot modify them
+     *
+     * @param apnFields fields to be disabled
+     */
+    private void disableFields(String[] apnFields) {
+        for (String apnField : apnFields) {
+            Preference preference = getPreferenceFromFieldName(apnField);
+            if (preference != null) {
+                preference.setEnabled(false);
+            }
+        }
+    }
+
+    /**
      * Disables all fields so that user cannot modify the APN
      */
     private void disableAllFields() {

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 9865fb2..a32e421 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java

@@ -507,4 +507,12 @@
         }
         return null;
     }
+
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (dialogId == DIALOG_RESTORE_DEFAULTAPN) {
+            return MetricsEvent.DIALOG_APN_RESTORE_DEFAULT;
+        }
+        return 0;
+    }
 }

diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index f729678..2c98a40 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java

@@ -49,8 +49,8 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.core.instrumentation.Instrumentable;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -84,6 +84,13 @@
             return this.name.compareTo(other.name);
         }
     }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mVisibilityLoggerMixin.onAttach(context);
+    }
+
     /**
      * Internal collection of device admin info objects for all profiles associated with the current
      * user.

diff --git a/src/com/android/settings/DialogCreatable.java b/src/com/android/settings/DialogCreatable.java
index a0de2e0..ca0d3d1 100644
--- a/src/com/android/settings/DialogCreatable.java
+++ b/src/com/android/settings/DialogCreatable.java

@@ -26,4 +26,6 @@
 public interface DialogCreatable {
 
     Dialog onCreateDialog(int dialogId);
+
+    int getDialogMetricsCategory(int dialogId);
 }

diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 2a7c852..6587097 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java

@@ -183,6 +183,14 @@
         return super.onCreateDialog(dialogId);
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (dialogId == DIALOG_WHEN_TO_DREAM) {
+            return MetricsEvent.DIALOG_DREAM_START_DELAY;
+        }
+        return 0;
+    }
+
     private Dialog createWhenToDreamDialog() {
         final CharSequence[] items = {
                 mContext.getString(R.string.screensaver_settings_summary_dock),

diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index a26d0dc..81945df 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java

@@ -259,6 +259,14 @@
             }
         }
 
+        @Override
+        public int getDialogMetricsCategory(int dialogId) {
+            if (dialogId == ACCESSIBILITY_WARNING_DIALOG) {
+                return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
+            }
+            return 0;
+        }
+
         private void setRequirePasswordState(boolean required) {
             mPasswordRequired = required;
         }

diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index ae5dd8b..80de9da 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java

@@ -108,6 +108,11 @@
         return null;
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        return MetricsEvent.DIALOG_PROXY_SELECTOR_ERROR;
+    }
+
     private void showDialog(int dialogId) {
         if (mDialogFragment != null) {
             Log.e(TAG, "Old dialog fragment not null!");

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index cc87c05..28230a9 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java

@@ -46,9 +46,11 @@
 
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.HelpUtils;
 
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Base class for Settings fragments, with some helper functions and dialog management.
@@ -501,10 +503,16 @@
         mDialogFragment.show(getChildFragmentManager(), Integer.toString(dialogId));
     }
 
+    @Override
     public Dialog onCreateDialog(int dialogId) {
         return null;
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        return 0;
+    }
+
     protected void removeDialog(int dialogId) {
         // mDialogFragment may not be visible yet in parent fragment's onResume().
         // To be able to dismiss dialog at that time, don't check
@@ -569,12 +577,10 @@
         onDialogShowing();
     }
 
-    public static class SettingsDialogFragment extends DialogFragment {
+    public static class SettingsDialogFragment extends InstrumentedDialogFragment {
         private static final String KEY_DIALOG_ID = "key_dialog_id";
         private static final String KEY_PARENT_FRAGMENT_ID = "key_parent_fragment_id";
 
-        private int mDialogId;
-
         private Fragment mParentFragment;
 
         private DialogInterface.OnCancelListener mOnCancelListener;
@@ -585,7 +591,7 @@
         }
 
         public SettingsDialogFragment(DialogCreatable fragment, int dialogId) {
-            mDialogId = dialogId;
+            super(fragment, dialogId);
             if (!(fragment instanceof Fragment)) {
                 throw new IllegalArgumentException("fragment argument must be an instance of "
                         + Fragment.class.getName());
@@ -593,6 +599,16 @@
             mParentFragment = (Fragment) fragment;
         }
 
+
+        @Override
+        public int getMetricsCategory() {
+            final int metricsCategory = mDialogCreatable.getDialogMetricsCategory(mDialogId);
+            if (metricsCategory <= 0) {
+                throw new IllegalStateException("Dialog must provide a metrics category");
+            }
+            return metricsCategory;
+        }
+
         @Override
         public void onSaveInstanceState(Bundle outState) {
             super.onSaveInstanceState(outState);

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 7485328..40c91ce 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java

@@ -259,6 +259,14 @@
         return null;
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (dialogId == DIALOG_AP_SETTINGS) {
+            return MetricsEvent.DIALOG_AP_SETTINGS;
+        }
+        return 0;
+    }
+
     private class TetherChangeReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context content, Intent intent) {

diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 6e4d40e..f67635e 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java

@@ -81,6 +81,12 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mVisibilityLoggerMixin.onAttach(context);
+    }
+
+    @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(

diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java
index 0b52bdc..6865090 100644
--- a/src/com/android/settings/ZonePicker.java
+++ b/src/com/android/settings/ZonePicker.java

@@ -137,6 +137,12 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mVisibilityLoggerMixin.onAttach(context);
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.ZONE_PICKER;
     }

diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 3168178..8535850 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

@@ -202,6 +202,15 @@
         }
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (dialogId == DIALOG_ID_ENABLE_WARNING) {
+            return MetricsEvent.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
+        } else {
+            return MetricsEvent.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
+        }
+    }
+
     private void updateSwitchBarToggleSwitch() {
         final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getActivity())
                 .contains(mComponentName);

diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 6b6791e..ae06f9c 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java

@@ -52,13 +52,13 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.android.collect.Lists;
-
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 
+import com.google.android.collect.Lists;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -153,6 +153,20 @@
     }
 
     @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case REALLY_REMOVE_DIALOG:
+                return MetricsEvent.DIALOG_ACCOUNT_SYNC_REMOVE;
+            case FAILED_REMOVAL_DIALOG:
+                return MetricsEvent.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL;
+            case CANT_DO_ONETIME_SYNC_DIALOG:
+                return MetricsEvent.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC;
+            default:
+                return 0;
+        }
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setPreferenceScreen(null);

diff --git a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
index 6f97068..f0a3fed 100644
--- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
+++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java

@@ -15,12 +15,25 @@
  */
 package com.android.settings.core.instrumentation;
 
+import com.android.settings.DialogCreatable;
 import com.android.settings.core.lifecycle.ObservableDialogFragment;
 
 public abstract class InstrumentedDialogFragment extends ObservableDialogFragment
         implements Instrumentable {
 
+    protected final DialogCreatable mDialogCreatable;
+    protected int mDialogId;
+
     public InstrumentedDialogFragment() {
+        this(null /* parentFragment */, 0 /* dialogId */);
+    }
+
+    /**
+     * Use this if the dialog is created via {@code DialogCreatable}
+     */
+    public InstrumentedDialogFragment(DialogCreatable dialogCreatable, int dialogId) {
+        mDialogCreatable = dialogCreatable;
+        mDialogId = dialogId;
         mLifecycle.addObserver(new VisibilityLoggerMixin(getMetricsCategory()));
     }
 

diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
index f4fe5e8..101dccd 100644
--- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
+++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java

@@ -50,11 +50,15 @@
 
     @Override
     public void onResume() {
-        mMetricsFeature.visible(null /* context */, mMetricsCategory);
+        if (mMetricsFeature != null) {
+            mMetricsFeature.visible(null /* context */, mMetricsCategory);
+        }
     }
 
     @Override
     public void onPause() {
-        mMetricsFeature.hidden(null /* context */, mMetricsCategory);
+        if (mMetricsFeature != null) {
+            mMetricsFeature.hidden(null /* context */, mMetricsCategory);
+        }
     }
 }

diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 20717ae..88ff8d5 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java

@@ -35,6 +35,7 @@
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.os.storage.VolumeRecord;
+import android.support.annotation.NonNull;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.text.TextUtils;
@@ -413,18 +414,37 @@
 
             builder.setPositiveButton(R.string.storage_menu_mount,
                     new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
+                /**
+                 * Check if an {@link RestrictedLockUtils#sendShowAdminSupportDetailsIntent admin
+                 * details intent} should be shown for the restriction and show it.
+                 *
+                 * @param restriction The restriction to check
+                 * @return {@code true} iff a intent was shown.
+                 */
+                private boolean wasAdminSupportIntentShown(@NonNull String restriction) {
                     EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
-                            getActivity(), UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA,
-                            UserHandle.myUserId());
+                            getActivity(), restriction, UserHandle.myUserId());
                     boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
-                            getActivity(), UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA,
-                            UserHandle.myUserId());
+                            getActivity(), restriction, UserHandle.myUserId());
                     if (admin != null && !hasBaseUserRestriction) {
                         RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (wasAdminSupportIntentShown(UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA)) {
                         return;
                     }
+
+                    if (vol.disk != null && vol.disk.isUsb() &&
+                            wasAdminSupportIntentShown(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+                        return;
+                    }
+
                     new MountTask(context, vol).execute();
                 }
             });

diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 98352a7..b37e2e2 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java

@@ -156,6 +156,17 @@
     }
 
     @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_START_TIME:
+                return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_START_TIME;
+            case DIALOG_END_TIME:
+                return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_END_TIME;
+            default:
+                return 0;
+        }
+    }
+    @Override
     public void onActivated(boolean activated) {
         mActivatedPreference.setChecked(activated);
     }

diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
index 182053f..31722e2 100644
--- a/src/com/android/settings/users/RestrictedProfileSettings.java
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java

@@ -26,6 +26,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -133,6 +134,18 @@
         return null;
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_ID_EDIT_USER_INFO:
+                return MetricsProto.MetricsEvent.DIALOG_USER_EDIT;
+            case DIALOG_CONFIRM_REMOVE:
+                return MetricsProto.MetricsEvent.DIALOG_USER_REMOVE;
+            default:
+                return 0;
+        }
+    }
+
     private void removeUser() {
         getView().post(new Runnable() {
             public void run() {

diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 65f55cb..47f8007 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java

@@ -26,6 +26,7 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -192,6 +193,20 @@
         throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_CONFIRM_REMOVE:
+                return MetricsProto.MetricsEvent.DIALOG_USER_REMOVE;
+            case DIALOG_CONFIRM_ENABLE_CALLING:
+                return MetricsProto.MetricsEvent.DIALOG_USER_ENABLE_CALLING;
+            case DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS:
+                return MetricsProto.MetricsEvent.DIALOG_USER_ENABLE_CALLING_AND_SMS;
+            default:
+                return 0;
+        }
+    }
+
     void removeUser() {
         mUserManager.removeUser(mUserInfo.id);
         finishFragment();

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bc3712e..d070838 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java

@@ -622,6 +622,32 @@
         }
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_CONFIRM_REMOVE:
+                return MetricsEvent.DIALOG_USER_REMOVE;
+            case DIALOG_USER_CANNOT_MANAGE:
+                return MetricsEvent.DIALOG_USER_CANNOT_MANAGE;
+            case DIALOG_ADD_USER:
+                return MetricsEvent.DIALOG_USER_ADD;
+            case DIALOG_SETUP_USER:
+                return MetricsEvent.DIALOG_USER_SETUP;
+            case DIALOG_SETUP_PROFILE:
+                return MetricsEvent.DIALOG_USER_SETUP_PROFILE;
+            case DIALOG_CHOOSE_USER_TYPE:
+                return MetricsEvent.DIALOG_USER_CHOOSE_TYPE;
+            case DIALOG_NEED_LOCKSCREEN:
+                return MetricsEvent.DIALOG_USER_NEED_LOCKSCREEN;
+            case DIALOG_CONFIRM_EXIT_GUEST:
+                return MetricsEvent.DIALOG_USER_CONFIRM_EXIT_GUEST;
+            case DIALOG_USER_PROFILE_EDITOR:
+                return MetricsEvent.DIALOG_USER_EDIT_PROFILE;
+            default:
+                return 0;
+        }
+    }
+
     private static boolean emergencyInfoActivityPresent(Context context) {
         Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO).setPackage("com.android.emergency");
         List<ResolveInfo> infos = context.getPackageManager().queryIntentActivities(intent, 0);

diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 0f194a6..c230f1d 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java

@@ -170,8 +170,8 @@
     }
 
     private boolean avoidBadWifiCurrentSettings() {
-        return Settings.Global.getInt(getContentResolver(),
-                Settings.Global.NETWORK_AVOID_BAD_WIFI, 0) == 1;
+        return "1".equals(Settings.Global.getString(getContentResolver(),
+                Settings.Global.NETWORK_AVOID_BAD_WIFI));
     }
 
     @Override
@@ -183,17 +183,10 @@
                     Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
                     ((SwitchPreference) preference).isChecked() ? 1 : 0);
         } else if (KEY_CELLULAR_FALLBACK.equals(key)) {
+            // On: avoid bad wifi. Off: prompt.
             String settingName = Settings.Global.NETWORK_AVOID_BAD_WIFI;
-            if (((SwitchPreference) preference).isChecked()) {
-                // The user wants to avoid bad wifi networks. Remember the choice.
-                Settings.Global.putInt(getContentResolver(), settingName, 1);
-            } else {
-                // Unset the setting. ConnectivityService interprets null to mean "use the carrier
-                // default". We don't set the setting to 0 because if we do, and the user switches
-                // to a carrier that does not restrict cellular fallback, then there is no way to
-                // set it to 1 again because on such a carrier the toggle is never shown.
-                Settings.Global.putString(getContentResolver(), settingName, null);
-            }
+            Settings.Global.putString(getContentResolver(), settingName,
+                    ((SwitchPreference) preference).isChecked() ? "1" : null);
         } else {
             return super.onPreferenceTreeClick(preference);
         }

diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
index b9e1eec..c641308 100644
--- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
+++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java

@@ -225,9 +225,9 @@
 
         switch (mState) {
             case STATE_ENABLE: {
-                mAlertParams.mPositiveButtonText = getString(android.R.string.ok);
+                mAlertParams.mPositiveButtonText = getString(R.string.allow);
                 mAlertParams.mPositiveButtonListener = this;
-                mAlertParams.mNegativeButtonText = getString(android.R.string.no);
+                mAlertParams.mNegativeButtonText = getString(R.string.deny);
                 mAlertParams.mNegativeButtonListener = this;
                 mAlertParams.mMessage = getString(R.string.wifi_ask_enable, mAppLabel);
             } break;
@@ -245,9 +245,9 @@
             } break;
 
             case STATE_DISABLE: {
-                mAlertParams.mPositiveButtonText = getString(android.R.string.ok);
+                mAlertParams.mPositiveButtonText = getString(R.string.allow);
                 mAlertParams.mPositiveButtonListener = this;
-                mAlertParams.mNegativeButtonText = getString(android.R.string.no);
+                mAlertParams.mNegativeButtonText = getString(R.string.deny);
                 mAlertParams.mNegativeButtonListener = this;
                 mAlertParams.mMessage = getString(R.string.wifi_ask_disable, mAppLabel);
             } break;

diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index ea92b7f..55f0b63 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java

@@ -25,6 +25,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -152,6 +153,16 @@
     }
 
     @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case WifiSettings.WIFI_DIALOG_ID:
+                return MetricsProto.MetricsEvent.DIALOG_WIFI_SAVED_AP_EDIT;
+            default:
+                return 0;
+        }
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 

diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index a8f9e33..6b7b2db 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java

@@ -164,24 +164,26 @@
 
     public void onClick(DialogInterface dialog, int which) {
         if (which != BUTTON_NEGATIVE && which != BUTTON_POSITIVE) return;
-        final boolean accept = (which == BUTTON_POSITIVE);
+        final boolean always = mAlwaysAllow.isChecked();
+        final String what, action;
 
         if (ACTION_PROMPT_UNVALIDATED.equals(mAction)) {
-            final String action = (accept ? "Connect" : "Ignore");
-            final boolean always = mAlwaysAllow.isChecked();
+            what = "NO_INTERNET";
+            final boolean accept = (which == BUTTON_POSITIVE);
+            action = (accept ? "Connect" : "Ignore");
             mCM.setAcceptUnvalidated(mNetwork, accept, always);
-            Log.d(TAG, "NO_INTERNET: " + action +  " network=" + mNetwork +
-                    (always ? " and remember" : ""));
         } else {
-            final String action = (accept ? "Switch" : "Cancel");
-            Log.d(TAG, "LOST_INTERNET: " + action);
-            // Only ever set the setting to 1. The values understood by ConnectivityService are null
-            // (use carrier default) or 1 (avoid bad networks regardless of carrier).
-            // TODO: Use a value other than 1 here to indicate a persisted "yes" or "no" given mAlwaysAllow.
-            if (accept) {
-                Settings.Global.putInt(mAlertParams.mContext.getContentResolver(),
-                        Settings.Global.NETWORK_AVOID_BAD_WIFI, 1);
+            what = "LOST_INTERNET";
+            final boolean avoid = (which == BUTTON_POSITIVE);
+            action = (avoid ? "Switch away" : "Get stuck");
+            if (always) {
+                Settings.Global.putString(mAlertParams.mContext.getContentResolver(),
+                        Settings.Global.NETWORK_AVOID_BAD_WIFI, avoid ? "1" : "0");
+            } else if (avoid) {
+                mCM.setAvoidUnvalidated(mNetwork);
             }
         }
+        Log.d(TAG, what + ": " + action +  " network=" + mNetwork +
+                (always ? " and remember" : ""));
     }
 }

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 6198bc9..782ff13 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java

@@ -597,6 +597,22 @@
         return super.onCreateDialog(dialogId);
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case WIFI_DIALOG_ID:
+                return MetricsEvent.DIALOG_WIFI_AP_EDIT;
+            case WPS_PBC_DIALOG_ID:
+                return MetricsEvent.DIALOG_WIFI_PBC;
+            case WPS_PIN_DIALOG_ID:
+                return MetricsEvent.DIALOG_WIFI_PIN;
+            case WRITE_NFC_DIALOG_ID:
+                return MetricsEvent.DIALOG_WIFI_WRITE_NFC;
+            default:
+                return 0;
+        }
+    }
+
     /**
      * Shows the latest access points available with supplemental information like
      * the strength of network and the security for it.

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index ddf7dfe..487090d 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java

@@ -496,6 +496,21 @@
     }
 
     @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_DISCONNECT:
+                return MetricsEvent.DIALOG_WIFI_P2P_DISCONNECT;
+            case DIALOG_CANCEL_CONNECT:
+                return MetricsEvent.DIALOG_WIFI_P2P_CANCEL_CONNECT;
+            case DIALOG_RENAME:
+                return MetricsEvent.DIALOG_WIFI_P2P_RENAME;
+            case DIALOG_DELETE_GROUP:
+                return MetricsEvent.DIALOG_WIFI_P2P_DELETE_GROUP;
+        }
+        return 0;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         if (mSelectedWifiPeer != null) {
             outState.putParcelable(SAVE_DIALOG_PEER, mSelectedWifiPeer.device);

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index c59b347..dff619a 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk

@@ -8,7 +8,8 @@
 
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    platform-system-robolectric
+    platform-system-robolectric \
+    truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := \
     junit4-target \

diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
new file mode 100644
index 0000000..da23d5f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.settings;
+
+import android.app.Dialog;
+import android.app.Fragment;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingsDialogFragmentTest {
+
+    private static final int DIALOG_ID = 15;
+
+    @Mock
+    private DialogCreatableFragment mDialogCreatable;
+    private SettingsPreferenceFragment.SettingsDialogFragment mDialogFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void testGetMetrics_shouldGetMetricFromDialogCreatable() {
+        when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(1);
+
+        mDialogFragment =
+                new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
+        mDialogFragment.getMetricsCategory();
+
+        // getDialogMetricsCategory called in constructor, and explicitly in test.
+        verify(mDialogCreatable, times(2)).getDialogMetricsCategory(DIALOG_ID);
+    }
+
+    @Test
+    public void testGetInvalidMetricsValue_shouldCrash() {
+        when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(-1);
+
+        try {
+            mDialogFragment = new SettingsPreferenceFragment.SettingsDialogFragment(
+                    mDialogCreatable, DIALOG_ID);
+        } catch (IllegalStateException e) {
+            // getDialogMetricsCategory called in constructor
+            verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID);
+            return;
+        }
+        fail("Should fail with IllegalStateException");
+    }
+
+    public static class DialogCreatableFragment extends Fragment implements DialogCreatable {
+
+        @Override
+        public Dialog onCreateDialog(int dialogId) {
+            return null;
+        }
+
+        @Override
+        public int getDialogMetricsCategory(int dialogId) {
+            return 0;
+        }
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
index 8742846..e55f069 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
 package com.android.settings;
 
 import android.content.Context;

diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index 973f13f..22be988 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java

@@ -29,7 +29,7 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -55,6 +55,6 @@
         MetricsFeatureProvider feature2 =
                 FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
 
-        assertTrue(feature1 == feature2);
+        assertThat(feature1 == feature2).isTrue();
     }
 }

diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
index 6280009..c009d0c 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java

@@ -28,7 +28,9 @@
 import org.robolectric.annotation.Config;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -51,6 +53,7 @@
     @Test
     public void shouldLogVisibleOnResume() {
         mMixin.onResume();
+
         verify(mMetricsFeature, times(1))
                 .visible(any(Context.class), eq(TestInstrumentable.TEST_METRIC));
     }
@@ -58,10 +61,21 @@
     @Test
     public void shouldLogHideOnPause() {
         mMixin.onPause();
+
         verify(mMetricsFeature, times(1))
                 .hidden(any(Context.class), eq(TestInstrumentable.TEST_METRIC));
     }
 
+    @Test
+    public void shouldNotLogIfMetricsFeatureIsNull() {
+        mMixin = new VisibilityLoggerMixin(TestInstrumentable.TEST_METRIC);
+        mMixin.onResume();
+        mMixin.onPause();
+
+        verify(mMetricsFeature, never())
+                .hidden(any(Context.class), anyInt());
+    }
+
     private final class TestInstrumentable implements Instrumentable {
 
         public static final int TEST_METRIC = 12345;

diff --git a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java
index 9016a77..bc7b129 100644
--- a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java
+++ b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java

@@ -33,7 +33,7 @@
 import org.robolectric.util.ActivityController;
 import org.robolectric.util.FragmentController;
 
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -109,15 +109,15 @@
         TestActivity activity = ac.get();
 
         ac.start();
-        assertTrue(activity.mActObserver.mOnStartObserved);
+        assertThat(activity.mActObserver.mOnStartObserved).isTrue();
         ac.resume();
-        assertTrue(activity.mActObserver.mOnResumeObserved);
+        assertThat(activity.mActObserver.mOnResumeObserved).isTrue();
         ac.pause();
-        assertTrue(activity.mActObserver.mOnPauseObserved);
+        assertThat(activity.mActObserver.mOnPauseObserved).isTrue();
         ac.stop();
-        assertTrue(activity.mActObserver.mOnStopObserved);
+        assertThat(activity.mActObserver.mOnStopObserved).isTrue();
         ac.destroy();
-        assertTrue(activity.mActObserver.mOnDestroyObserved);
+        assertThat(activity.mActObserver.mOnDestroyObserved).isTrue();
     }
 
     @Test
@@ -128,12 +128,12 @@
 
         fragmentController.attach().create().start().resume().pause().stop().destroy();
 
-        assertTrue(fragment.mFragObserver.mOnAttachObserved);
-        assertTrue(fragment.mFragObserver.mOnAttachHasContext);
-        assertTrue(fragment.mFragObserver.mOnStartObserved);
-        assertTrue(fragment.mFragObserver.mOnResumeObserved);
-        assertTrue(fragment.mFragObserver.mOnPauseObserved);
-        assertTrue(fragment.mFragObserver.mOnStopObserved);
-        assertTrue(fragment.mFragObserver.mOnDestroyObserved);
+        assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue();
+        assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue();
+        assertThat(fragment.mFragObserver.mOnStartObserved).isTrue();
+        assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue();
+        assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue();
+        assertThat(fragment.mFragObserver.mOnStopObserved).isTrue();
+        assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue();
     }
 }

diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index 04f241e..368d0a1 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java

@@ -3,23 +3,24 @@
 import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
 import com.android.settings.TestConfig;
-import junit.framework.Assert;
+import com.android.settingslib.net.DataUsageController.DataUsageInfo;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static com.android.settingslib.net.DataUsageController.*;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DataUsageInfoControllerTest {
     private DataUsageInfoController mInfoController;
-    private  DataUsageInfo info;
+    private DataUsageInfo info;
+    private static final int NEGATIVE = -1;
+    private static final int ZERO = 0;
+    private static final int POSITIVE_SMALL = 1;
+    private static final int POSITIVE_LARGE = 5;
 
     @Before
     public void setUp()  {
@@ -29,50 +30,50 @@
 
     @Test
     public void testLowUsageLowWarning_LimitUsed() {
-        info.warningLevel = 5;
-        info.limitLevel = 10;
-        info.usageLevel = 5;
-        assertEquals(mInfoController.getSummaryLimit(info), info.limitLevel);
+        info.warningLevel = POSITIVE_SMALL;
+        info.limitLevel = POSITIVE_LARGE;
+        info.usageLevel = POSITIVE_SMALL;
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
     }
 
     @Test
     public void testLowUsageEqualWarning_LimitUsed() {
-        info.warningLevel = 10;
-        info.limitLevel = 10;
-        info.usageLevel = 5;
-        assertEquals(mInfoController.getSummaryLimit(info), info.limitLevel);
+        info.warningLevel = POSITIVE_LARGE;
+        info.limitLevel = POSITIVE_LARGE;
+        info.usageLevel = POSITIVE_SMALL;
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
     }
 
     @Test
     public void testNoLimitNoUsage_WarningUsed() {
-        info.warningLevel = 10;
-        info.limitLevel = 0;
-        info.usageLevel = 0;
-        assertEquals(mInfoController.getSummaryLimit(info), info.warningLevel);
+        info.warningLevel = POSITIVE_LARGE;
+        info.limitLevel = ZERO;
+        info.usageLevel = ZERO;
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
     }
 
     @Test
     public void testNoLimitLowUsage_WarningUsed() {
-        info.warningLevel = 10;
-        info.limitLevel = 0;
-        info.usageLevel = 5;
-        assertEquals(mInfoController.getSummaryLimit(info), info.warningLevel);
+        info.warningLevel = POSITIVE_LARGE;
+        info.limitLevel = ZERO;
+        info.usageLevel = POSITIVE_SMALL;
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
     }
 
     @Test
     public void testLowWarningNoLimit_UsageUsed() {
-        info.warningLevel = 5;
-        info.limitLevel = 0;
-        info.usageLevel = 10;
-        assertEquals(mInfoController.getSummaryLimit(info), info.usageLevel);
+        info.warningLevel = POSITIVE_SMALL;
+        info.limitLevel = ZERO;
+        info.usageLevel = POSITIVE_LARGE;
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
     }
 
     @Test
     public void testLowWarningLowLimit_UsageUsed() {
-        info.warningLevel = 5;
-        info.limitLevel = 5;
-        info.usageLevel = 10;
-        assertEquals(mInfoController.getSummaryLimit(info), info.usageLevel);
+        info.warningLevel = POSITIVE_SMALL;
+        info.limitLevel = POSITIVE_SMALL;
+        info.usageLevel = POSITIVE_LARGE;
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
     }
 
     private NetworkPolicy getDefaultNetworkPolicy() {
@@ -87,60 +88,56 @@
 
     @Test
     public void testNullArguments_NoError() {
-        try {
-            mInfoController.updateDataLimit(null, null);
-            mInfoController.updateDataLimit(info, null);
-            mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
-        } catch (Exception e) {
-            fail("Update Data Limit should drop calls with null arguments");
-        }
+        mInfoController.updateDataLimit(null, null);
+        mInfoController.updateDataLimit(info, null);
+        mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
     }
 
     @Test
     public void testNegativeWarning_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = -5;
+        policy.warningBytes = NEGATIVE;
         mInfoController.updateDataLimit(info, policy);
-        Assert.assertEquals(0, info.warningLevel);
+        assertThat(info.warningLevel).isEqualTo(ZERO);
     }
 
     @Test
     public void testWarningZero_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = 0;
+        policy.warningBytes = ZERO;
         mInfoController.updateDataLimit(info, policy);
-        Assert.assertEquals(0, info.warningLevel);
+        assertThat(info.warningLevel).isEqualTo(ZERO);
     }
 
     @Test
     public void testWarningPositive_UpdatedToWarning() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = 5;
+        policy.warningBytes = POSITIVE_SMALL;
         mInfoController.updateDataLimit(info, policy);
-        Assert.assertEquals(policy.warningBytes, info.warningLevel);
+        assertThat(info.warningLevel).isEqualTo(policy.warningBytes);
     }
 
     @Test
     public void testLimitNegative_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = -5;
+        policy.limitBytes = NEGATIVE;
         mInfoController.updateDataLimit(info, policy);
-        Assert.assertEquals(0, info.limitLevel);
+        assertThat(info.limitLevel).isEqualTo(ZERO);
     }
 
     @Test
     public void testLimitZero_UpdatedToZero() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = 0;
+        policy.limitBytes = ZERO;
         mInfoController.updateDataLimit(info, policy);
-        Assert.assertEquals(0, info.limitLevel);
+        assertThat(info.limitLevel).isEqualTo(ZERO);
     }
 
     @Test
     public void testLimitPositive_UpdatedToLimit() {
         NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = 5;
+        policy.limitBytes = POSITIVE_SMALL;
         mInfoController.updateDataLimit(info, policy);
-        Assert.assertEquals(policy.limitBytes, info.limitLevel);
+        assertThat(info.limitLevel).isEqualTo(policy.limitBytes);
     }
-}
+}
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 5ed0746..e9f4446 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java

@@ -28,7 +28,7 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static junit.framework.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.when;
 
@@ -55,6 +55,6 @@
     @Test
     public void testMobileDataStatus() {
         boolean hasMobileData = DataUsageSummary.hasMobileData(mContext);
-        assertTrue(hasMobileData);
+        assertThat(hasMobileData).isTrue();
     }
 }

diff --git a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
index 25119e0..6a804d0 100644
--- a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java

@@ -23,9 +23,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -33,10 +32,10 @@
 
     @Test
     public void testMainThread() throws InterruptedException {
-        assertTrue(ThreadUtils.isMainThread());
+        assertThat(ThreadUtils.isMainThread()).isTrue();
         Thread background = new Thread(new Runnable() {
             public void run() {
-                assertFalse(ThreadUtils.isMainThread());
+                assertThat(ThreadUtils.isMainThread()).isFalse();
             }
         });
         background.start();

diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index b56f714..2b3613f 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java

@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 
 import java.util.Locale;
 
@@ -64,19 +64,19 @@
     private void testRtlCompatibleInner(int currentItem) {
         // Set up the environment
         Locale.setDefault(mLocaleEn);
-        assertEquals(View.LAYOUT_DIRECTION_LTR,
-                TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()));
+        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
+                .isEqualTo(View.LAYOUT_DIRECTION_LTR);
         mTestViewPager.setCurrentItem(currentItem);
-        assertEquals(currentItem, mTestViewPager.getCurrentItem());
+        assertThat(mTestViewPager.getCurrentItem()).isEqualTo(currentItem);
 
         // Simulate to change the language to RTL
         Parcelable savedInstance = mTestViewPager.onSaveInstanceState();
         Locale.setDefault(mLocaleHe);
-        assertEquals(View.LAYOUT_DIRECTION_RTL,
-                TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()));
+        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
+                .isEqualTo(View.LAYOUT_DIRECTION_RTL);
         mTestViewPager.onRestoreInstanceState(savedInstance);
 
-        assertEquals(currentItem, mTestViewPager.getCurrentItem());
+        assertThat(mTestViewPager.getCurrentItem()).isEqualTo(currentItem);
     }
commit	7cb1453a845245e530d1231a6bb88e4126571b5a	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Thu Sep 22 15:26:26 2016 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Sep 22 15:26:26 2016 +0000
tree	a870bab048cbc720df719f6104b01ee074360dcf
parent	29a95b49947c2379fff686f8182049e3f179c476 [diff]
parent	fce3e960fd0f932c3b3d186aa1e8b8c777b52a8a [diff]