Merge "Move private volume storage calculations into a shared lib."

commit: 88110e21f6e6fb6ef352ba531c952b398ca3f078 [log] [tgz]
author: Daniel Nishi <dhnishi@google.com> Tue Sep 27 16:45:10 2016 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 16:45:14 2016 +0000
tree: 1160aa3b40a80bf165d92c9948549a763d86f5ca
parent: 13bdedb2090b83c59dba338ce4303a96c92bb6d1 [diff]
parent: 355390da93be6859ee57fb8880fca9b0cf3d900d [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c469ad..25fc62b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -3013,6 +3013,18 @@
                        android:value="true" />
         </activity>
 
+        <activity android:name="Settings$AutomaticStorageManagerSettingsActivity"
+                  android:exported="@bool/config_has_storage_manager"
+                  android:label="@string/automatic_storage_manager_settings"
+                  android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.STORAGE_MANAGER_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />
+        </activity>
+
         <service
             android:name=".SettingsDumpService"
             android:exported="true"

diff --git a/res/layout/gesture_preference.xml b/res/layout/gesture_preference.xml
index 883b94e..d5685ea 100644
--- a/res/layout/gesture_preference.xml
+++ b/res/layout/gesture_preference.xml

@@ -51,6 +51,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/gesture_animation_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/gestures_setting_background_color"
@@ -58,7 +59,6 @@
         android:orientation="horizontal">
 
         <com.android.settings.widget.AspectRatioFrameLayout
-            android:id="@+id/gesture_animation_frame"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"

diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index f93adc2..a635612 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml

@@ -140,7 +140,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/display_summary_on"
+                        android:text="@string/display_summary_example"
                         android:textAppearance="@android:style/TextAppearance.Material.Body1"
                         android:textColor="?android:attr/textColorSecondary" />
                 </LinearLayout>

diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index cc146f8..acef60b 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml

@@ -21,14 +21,15 @@
     android:background="?android:attr/selectableItemBackground"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingTop="15dip"
-    android:paddingBottom="15dip"
+    android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal">
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:paddingTop="15dip"
+        android:paddingBottom="15dip"
         android:orientation="vertical">
 
         <TextView
@@ -53,8 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="invisible"
-        android:clickable="false"
-        android:focusable="false"
+        android:padding="8dp"
         android:layout_weight="0" />
 
 </LinearLayout>

diff --git a/res/raw/gesture_ambient_lift.mp4 b/res/raw/gesture_ambient_lift.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_ambient_lift.mp4


diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 38a6a9e..0741d4c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/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">"Ontsluit met vingerafdruk"</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">"Gebruik jou vingerafdruk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Raak eenvoudig die vingerafdruksensor om jou foon te ontsluit, aankope te magtig en by programme aan te meld. Wees versigtig wie se vingerafdrukke jy byvoeg. Selfs net een vingerafdruk wat bygevoeg is, kan enige van hierdie dinge doen.\n\nLet wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</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">"Raak bloot die vingerafdruksensor om aankope te magtig of by programme aan te meld. Wees versigtig wie se vingerafdrukke jy byvoeg. Selfs een bygevoegde vingerafdruk kan enige van hierdie goed doen.\n\nLet wel: Jy kan nie jou vingerafdruk gebruik om hierdie toestel te ontsluit nie. Kontak jou organisasie se administateur vir meer inligting."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Raak eenvoudig die vingerafdruksensor om jou foon te ontsluit, aankope te magtig of by programme aan te meld. Wees versigtig wie se vingerafdrukke jy byvoeg. Selfs net een vingerafdruk wat bygevoeg is, kan enige van hierdie dinge doen.\n\nLet wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselleer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Gaan voort"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimaliseer batterygebruik wanneer Wi-Fi aan is"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Beperk Wi-Fi-batterygebruik"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Skakel na sellulêre data oor as Wi‑Fi internettoegang verloor."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Terugvalopsie van sellulêre data"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Gebruik sellulêre data wanneer Wi‑Fi internettoegang verloor. Bykomende heffings kan geld."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg netwerk by"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-netwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-drukknoppie"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPEL"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Hierdie netwerk het nie internettoegang nie. Bly gekoppel?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Moenie weer vir hierdie netwerk vra nie"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi is nie aan die internet gekoppel nie"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Jy kan na die selfoonnetwerk oorskakel wanneer Wi-Fi \'n swak verbinding het. Datagebruikkoste kan geld."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Skakel oor na sellulêr"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Bly op Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Moet nooit weer wys nie"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Tuis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiekeffekte"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Luivolume"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sonsondergang tot sonsopkoms"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Begintyd"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Eindtyd"</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">"Af. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Sal nooit outomaties aanskakel nie."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Sal outomaties aanskakel om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Sal outomaties aanskakel met sonsondergang."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Aan. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Sal nooit outomaties afskakel nie."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sal outomaties afskakel om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sal outomaties afskakel met sonsopkoms."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-weergawe"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android-sekuriteitregstelling-vlak"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Toerusting-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basisbandweergawe"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernweergawe"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Ander"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Stelsel"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Verken <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">"Ander sluit in gedeelde lêers wat deur programme gestoor is, lêers wat van die internet of Bluetooth afgelaai is, Android-lêers en so aan. \n\nTik op Verken om die sigbare inhoud van hierdie <xliff:g id="NAME">^1</xliff:g> te sien."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Stelsel sluit lêers in wat Android nie individueel kan vertoon nie."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> het dalk foto\'s, musiek, flieks, programme of ander data gestoor wat <xliff:g id="SIZE">^2</xliff:g> van die berging opneem. \n\nSkakel oor na <xliff:g id="USER_1">^1</xliff:g> om besonderhede te sien."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Stel jou <xliff:g id="NAME">^1</xliff:g> op"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruik as draagbare berging"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot Moenie steur nie"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Geen geïnstalleerde programme het toegang tot Moenie steur nie versoek nie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanale"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Moet nooit kennisgewings van hierdie program af wys nie"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokkeer almal"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Moet nooit kennisgewings van hierdie kanaal af wys nie"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie steur nie"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie steur nie na \'Net prioriteit\' gestel is"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op die sluitskerm"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitief"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klaar"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Belangrikheid"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Flikker kennisgewinglig altyd"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibreer altyd"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Reëlnaam"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Voer reëlnaam in"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Reëlnaam word reeds gebruik"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Netwerkbeperkinge"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Diensverskaffer se datarekening kan van toestel se rekening verskil"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Stel datawaarskuwing"</string>
     <string name="data_warning" msgid="209133958008062117">"Datawaarskuwing"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Stel datalimiet"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 53038f0..91f4091 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/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ማስታወሻ፦ የጣት አሻራዎ ደህንነት ከጠንካራ ስርዓተ ጥለት ወይም ፒን ያነሰ ሊሆን ይችላል።"</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ማስታወሻ፦ የጣት አሻራዎ ደህንነት ከጠንካራ ስርዓተ ጥለት ወይም ፒን ያነሰ ሊሆን ይችላል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ይቅር"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ቀጥል"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"የመሣሪያ መታወቂያ"</string>
     <string name="baseband_version" msgid="1848990160763524801">"የቤዝባንድ ሥሪት"</string>
     <string name="kernel_version" msgid="9192574954196167602">"የከርነል ሥሪት"</string>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-ar/arrays.xml b/res/values-ar/arrays.xml
index b2078b6..01ee3ec 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml

@@ -30,32 +30,32 @@
     <item msgid="8392017019801393511">"الكل"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"۱۵ ثانية"</item>
+    <item msgid="3342301044271143016">"١٥ ثانية"</item>
     <item msgid="8881760709354815449">"۳۰ ثانية"</item>
     <item msgid="7589406073232279088">"دقيقة واحدة"</item>
     <item msgid="7001195990902244174">"۲ دقائق"</item>
-    <item msgid="7489864775127957179">"۵ دقائق"</item>
+    <item msgid="7489864775127957179">"٥ دقائق"</item>
     <item msgid="2314124409517439288">"۱۰ دقائق"</item>
     <item msgid="6864027152847611413">"۳۰ دقيقة"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"مطلقًا"</item>
-    <item msgid="2194151041885903260">"۱۵ ثانية"</item>
+    <item msgid="2194151041885903260">"١٥ ثانية"</item>
     <item msgid="5892295237131074341">"۳۰ ثانية"</item>
     <item msgid="3538441365970038213">"دقيقة واحدة"</item>
     <item msgid="412343871668955639">"دقيقتان"</item>
-    <item msgid="5076853889688991690">"۵ دقائق"</item>
+    <item msgid="5076853889688991690">"٥ دقائق"</item>
     <item msgid="1903860996174927898">"۱۰ دقائق"</item>
     <item msgid="6415509612413178727">"۳۰ دقيقة"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"فورًا"</item>
-    <item msgid="6736512735606834431">"۵ ثوانٍ"</item>
-    <item msgid="8044619388267891375">"۱۵ ثانية"</item>
+    <item msgid="6736512735606834431">"٥ ثوانٍ"</item>
+    <item msgid="8044619388267891375">"١٥ ثانية"</item>
     <item msgid="1822002388249545488">"۳۰ ثانية"</item>
     <item msgid="8538071621211916519">"دقيقة واحدة"</item>
     <item msgid="5663439580228932882">"دقيقتان"</item>
-    <item msgid="49888496216106852">"۵ دقائق"</item>
+    <item msgid="49888496216106852">"٥ دقائق"</item>
     <item msgid="9002737361305019353">"۱۰ دقائق"</item>
     <item msgid="4322676235684793329">"۳۰ دقيقة"</item>
   </string-array>
@@ -134,7 +134,7 @@
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"دقيقتان"</item>
-    <item msgid="8675215713017289017">"۵ دقائق"</item>
+    <item msgid="8675215713017289017">"٥ دقائق"</item>
     <item msgid="477015974247590543">"ساعة واحدة"</item>
     <item msgid="5198271470953124739">"بلا مهلة"</item>
   </string-array>
@@ -401,9 +401,9 @@
     <item msgid="3821418743395480313">"منخفضة"</item>
   </string-array>
   <string-array name="captioning_opacity_selector_titles">
-    <item msgid="7622491218136667566">"٪۲۵"</item>
-    <item msgid="2367156416247936773">"٪۵۰"</item>
-    <item msgid="5395560410107149298">"٪۷۵"</item>
+    <item msgid="7622491218136667566">"٢٥٪"</item>
+    <item msgid="2367156416247936773">"٥٠٪"</item>
+    <item msgid="5395560410107149298">"٧٥٪"</item>
     <item msgid="8342334626783983353">"٪۱۰۰"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">

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

@@ -355,11 +355,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ملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</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ملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"متابعة"</string>
@@ -723,6 +721,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>
+    <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>
@@ -800,14 +800,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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
@@ -901,8 +898,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>
@@ -974,22 +970,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>
@@ -1058,8 +1046,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">"معرّف الجهاز"</string>
     <string name="baseband_version" msgid="1848990160763524801">"إصدار النطاق الأساسي"</string>
     <string name="kernel_version" msgid="9192574954196167602">"إصدار النواة"</string>
@@ -1190,10 +1177,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>
@@ -2760,8 +2745,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>
+    <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>
+    <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>
@@ -2770,6 +2758,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>
+    <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>
@@ -3213,8 +3203,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-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index b9eb2cf..8024fbe 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/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">"Barmaq izi ilə kiliddən çıxarın"</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">"Barmaq izinizi istifadə edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: Barmaq iziniz güclü model və ya PİN koddan daha az təhlükəsizdir."</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">"Alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: barmaq izinizi bu cihazın kildiini açmaq üçün istifadə edə bilməzsiniz. Ətraflı məlumat üçün, təşkilatın admini ilə əlaqə saxlayın."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: Barmaq iziniz güclü model və ya PİN koddan daha az təhlükəsizdir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ləğv edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davam edin"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi aktiv olan zaman batareya istifadəsini minimuma endirin"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi tərəfindən enerji istifadəsinə limit qoyun"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi-Fi İnternet bağlantısını itirsə, mobil dataya keçin."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobil data ehtiyat seçimi"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Wi‑Fi İnternetə girişi itirdiyi zaman mobil data istifadə edin. Əlavə ödənişlər tətbiq oluna bilər."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Şəbəkə əlavə edin"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi şəbəkələri"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS basmadüymə"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"QOŞULUN"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Bu şəbəkənin internetə girişi yoxdur. Qoşulu qalsın?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Bu şəbəkə üçün daha soruşma"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi internetə qoşulmayıb"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Wi‑Fi bağlantısı keyfiyyətsiz olanda mobil internetə keçə bilərsiniz. Mobil internet əlavə xərclərə səbəb ola bilər."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Mobil internetə keçin"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi‑Fi şəbəkəsində qalın"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Heç vaxt yenidən göstərməyin"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Qoşul"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Şəbəkəyə qoşulmaq alınmadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Əsas səhifə"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Göstər"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Səs"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Həcmlər"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiqi effektləri"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Zəng həcmi"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Qürub-günəşin çıxması"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Başlama vaxtı"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Bitmə tarixi"</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">"Deaktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Heç vaxt avtomatik aktivləşdirilməyəcək."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> saatında avtomatik yandırın."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Qürub vaxtı avtomatik aktivləşdiriləcək."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Heç vaxt avtomatik deaktiv edilməyəcək."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> radələrində avtomatik deaktiv ediləcək."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Günəş çıxan vaxt avtomatik deaktiv ediləcək."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Yuxu"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran sönür"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versiyası"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android təhlükəsizlik yamaq səviyyəsi"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Avadanlıq ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband versiyası"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel versiyası"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Digər"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> araşdırın"</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">"Digərlərinə İnternet və ya Bluetooth, Android fayl və s. yerdən endirilmiş tətbiq və fayllarda saxlanılan paylaşılmış fayllar daxildir. \n\nBu <xliff:g id="NAME">^1</xliff:g> adlı kartın görünən kontentinə baxmaq üçün Kəşf edin seçiminə tıklayın."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistemə Androidin fərdi şəkildə göstərə bilməyəcəyi fayllar daxildir."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> yaddaşda <xliff:g id="SIZE">^2</xliff:g> yer tutan foto, musiqi, film, tətbiq və digər datanı saxlamış ola bilər. \n\nDetallara baxmaq üçün <xliff:g id="USER_1">^1</xliff:g> adına keçin."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazını quraşdırın"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Daşınan yaddaş ehtiyatı kimi istifadə edin"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Narahat etməyin\" girişi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanallar"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Hamısını bloklayın"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Bu tətbiqdən olan bildirişləri heç vaxt göstərmə"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Hamısını bloklayın"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Bu kanaldan olan bildirişləri heç vaxt göstərməyin"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Narahat etməyin\" seçimini əvəzləyin"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Narahat Etməyin seçimi Yalnız Prioritet üçün ayarlandıqda bildirişlərin mane olmasına imkan verin"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekran kilidində"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Həssas"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hazır"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Əhəmiyyət"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Bildiriş işığını hər zaman yandırın"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Hər zaman vibrasiya rejimində olsun"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Qayda adı"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Qayda adını daxil edin"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Qayda adı artıq istifadədədir"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Şəbəkə məhdudiyyətləri"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operator data hesablanması cihazınızın hesablamasından fərqli ola bilər"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Data xəbərdarlığı ayarlayın"</string>
     <string name="data_warning" msgid="209133958008062117">"Data xəbərdarlığı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Data limiti ayarlayın"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limiti"</string>

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

@@ -346,11 +346,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključajte otiskom prsta"</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">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, ovlastili kupovine ili se prijavili na aplikacije Ovo će biti moguće pomoću svih otisaka prstiju koje dodate, pa budite oprezni koga dodajete.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</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">"Samo dodirnite senzor otiska prsta da biste odobrili kupovinu ili se prijavili na aplikacije. Pažljivo birajte čije otiske prstiju dodajete. Čak i samo jedan dodati otisak može da uradi bilo šta od gorenavedenog.\n\nNapomena: Ne možete da koristite otisak prsta za otključavanje ovog uređaja. Za više informacija obratite se administratoru organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, dali ovlašćenje za kupovine ili da biste se prijavili u aplikacije. Ovo će biti moguće pomoću svih otisaka prstiju koje dodate, pa budite oprezni čije otiske dodajete.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
@@ -696,6 +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>
+    <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>
@@ -773,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
@@ -874,8 +871,7 @@
     <string name="home_settings" msgid="212375129455718176">"Početna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Jačine zvuka"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzički efekti"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Jačina zvuka zvona"</string>
@@ -947,22 +943,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od zalaska do izlaska sunca"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vreme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vreme završetka"</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">"Isključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikada se ne uključuje automatski."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Uključuje se automatski kada sunce zađe."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Uključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikada se ne isključuje automatski."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Isključuje se automatski kada sunce izađe."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Spavanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1028,8 +1016,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android verzija"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivo bezbednosne zakrpe za Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID opreme"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Verzija osnovnog propusnog opsega"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgra"</string>
@@ -1160,10 +1147,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Drugo"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži uređaj <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">"Ostalo obuhvata deljene datoteke koje su sačuvale aplikacije, datoteke preuzete sa Interneta ili Bluetooth-a, Android datoteke i tako dalje. \n\nDa biste videli vidljivi sadržaj na uređaju <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem obuhvata datoteke koje Android ne može da prikaže zasebno."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> je možda sačuvao/la slike, muziku, filmove, aplikacije ili druge podatke koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> memorije. \n\nDa biste pregledali detalje, prebacite na korisnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Koristi kao prenosivu memoriju"</string>
@@ -2052,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>
@@ -2694,8 +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>
+    <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>
+    <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>
@@ -2704,6 +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>
+    <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>
@@ -3123,8 +3113,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka kod mobilnog operatera se možda razlikuje od obračuna uređaja."</string>
     <string name="data_used_template" msgid="3245919669966296505">"Potrošili ste <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">"Podešavanje upozorenja o podacima"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje za potrošnju podataka"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Podesi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za potrošnju podataka"</string>

diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index 8df753a..a8d7f3f 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml

@@ -349,11 +349,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>
@@ -705,6 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Зменшыць выкарыстанне батарэi, калi ўключана 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>
+    <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">"Сеткi Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
@@ -782,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Забыць"</string>
@@ -883,8 +880,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>
@@ -956,22 +952,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>
@@ -1038,8 +1026,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">"Iдэнтыфiкатар абсталявання"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Версія baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Вэрсія ядра"</string>
@@ -1170,10 +1157,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">"Раздзел \"Іншае\" ўключае абагуленыя файлы, захаваныя праграмамі, файлы, спампаваныя з інтэрнэту або па 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Выкарыстоўваць у якасці партатыўнага сховішча"</string>
@@ -2716,8 +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>
+    <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>
+    <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>
@@ -2726,6 +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>
+    <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>
@@ -3153,8 +3143,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-bg/strings.xml b/res/values-bg/strings.xml
index 5b1eb8d..e5ef9bb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/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Забележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</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Забележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отказ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Напред"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"Идент. № на оборудването"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Версия на базовия диапазон"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия на ядрото"</string>
@@ -1150,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">"Категорията „Други“ включва споделените файлове, запазени от приложенията, файловете, изтеглени от интернет или през 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Използване като преносимо хранилище"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index f5ace5d..c8c5654 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/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,6 +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>
+    <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">"ওয়াই-ফাই নেটওয়ার্কগুলি"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS পুশ বোতাম"</string>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"ভুলে যান"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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">"অন্যগুলির মধ্যে, অ্যাপগুলির দ্বারা সংরক্ষিত শেয়ার করা ফাইল, ইন্টারনেট বা 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 121530e..e1a4943 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml

@@ -346,11 +346,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključaj otiskom prsta"</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">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da otključate telefon, odobrite kupovinu ili da se prijavite u aplikaciju. Pazite čije otiske prsta dodajete. Samo jedan dodani otisak može izvršiti sve navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN kôda."</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">"Samo dodirnite senzor za otisak prsta da odobrite kupovinu ili se prijavite u aplikacije. Pazite čije otiske dodajete. Jedan jedini dodani otisak može izvršiti sve gore navedeno.\n\nNapomena: Ne možete koristiti svoj otisak prsta za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Samo dodirnite senzor za otisak prsta za otključavanje telefona, odobravanje kupovina ili prijavljivanje u aplikacije. Pazite čije otiske prstiju dodajete. Jedan jedini dodani otisak može izvršiti sve gore navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN kôda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
@@ -696,6 +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>
+    <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>
@@ -773,14 +773,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
@@ -874,8 +871,7 @@
     <string name="home_settings" msgid="212375129455718176">"Početna stranica"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Jačine zvuka"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzički efekti"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Jačina zvuka zvona"</string>
@@ -947,22 +943,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od sutona do svitanja"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vrijeme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vrijeme završetka"</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">"Isključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikada se neće automatski uključiti."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Automatski će se uključiti u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Automatski će se uključiti u suton."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Uključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikada se neće automatski isključiti."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Automatski će se isključiti u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Automatski će se isključiti u svitanje."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje mirovanja"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1028,8 +1016,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzija sistema Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivo Android sigurnosne zakrpe"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID opreme"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Verzija nemoduliranog opsega"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
@@ -1160,10 +1147,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Ostalo"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži korisnika <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">"Ostalo uključuje podijeljene fajlove koji su sačuvani pomoću aplikacija, fajlove preuzete s Interneta ili Bluetootha, fajlove za Android uređaje i tako dalje. \n\nDa vidite vidljivi sadržaj ove <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem uključuje fajlove koje Android ne može pojedinačno prikazati."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> možda ima sačuvane slike, muziku, filmove, aplikacije ili druge podatke koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> memorije. \n\nDa biste pogledali detalje, pređite na račun korisnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Koristiti kao prijenosnu memoriju"</string>
@@ -2694,8 +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>
+    <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>
+    <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>
@@ -2704,6 +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>
+    <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>
@@ -3123,8 +3113,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Ograničenje mreže"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Postavite upozorenje o podacima"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za podatke"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a821a66..47becf3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/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">"Desbloqueig amb empremta"</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">"Utilitzar l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que hi afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets."</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">"Només cal que toquis el sensor d\'empremtes digitals per autoritzar una compra o iniciar la sessió en una aplicació. Vés amb compte a l\'hora d\'afegir-hi empremtes digitals; tingues present que totes les que hi afegeixis podran dur a terme totes aquestes accions.\n\nNota: no pots fer servir l\'empremta digital per desbloquejar el dispositiu. Per obtenir més informació, contacta amb l\'administrador de l\'organització."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que hi afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel·la"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Pàgina d\'inici"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volum del to"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"De la posta de sol a l\'alba"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora d’inici"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalització"</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">"Desactivat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No s\'activarà mai automàticament."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"S\'activarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"S\'activarà automàticament quan es pongui el sol."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No es desactivarà mai automàticament."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Es desactivarà automàticament quan surti el sol."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versió d\'Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivell de pedaç de seguretat d\'Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Id. de l\'equip"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versió de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versió del kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Altres"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explora <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">"A la secció Altres s\'inclouen fitxers compartits que han desat les aplicacions, fitxers que s\'han baixat d\'Internet o mitjançant Bluetooth, i fitxers d\'Android, entre d\'altres. \n\nPer veure el contingut visible d\'aquest dispositiu <xliff:g id="NAME">^1</xliff:g>, toca Explora."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"El sistema inclou fitxers que Android no pot mostrar de manera individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"És possible que <xliff:g id="USER_0">^1</xliff:g> hagi desat fotos, música, pel·lícules, aplicacions o altres dades que ocupen <xliff:g id="SIZE">^2</xliff:g> d\'emmagatzematge. \n\nPer veure\'n detalls, canvia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilitza com a emmagatzematge portàtil"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restriccions de xarxa"</string>
     <string name="operator_warning" msgid="1862988028996859195">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilitzats"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Estableix l\'avís de dades"</string>
     <string name="data_warning" msgid="209133958008062117">"Advertiment sobre ús de dades"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Defineix un límit de dades"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límit de dades"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a328f25..f571669 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -349,11 +349,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odemknutí otiskem prstu"</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">"Použití otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor otisků prstů. Dobře zvažte, čí otisky do zařízení přidáte. Uvedené akce bude možné provádět pomocí každého z přidaných otisků.\n\nPoznámka: Otisk prstu může být méně bezpečný než silné gesto nebo 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">"Autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor otisků prstů. Dobře zvažte, čí otisky do zařízení přidáte. Uvedené akce bude možné provádět pomocí každého z přidaných otisků.\n\nPoznámka: Otisk prstu nelze použít k odemykání tohoto zařízení. Další informace vám poskytne administrátor vaší organizace."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor otisků prstů. Dobře zvažte, čí otisky do zařízení přidáte. Uvedené akce bude možné provádět pomocí každého z přidaných otisků.\n\nPoznámka: Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Zrušit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovat"</string>
@@ -705,6 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovat využívání baterie při zapnuté síti Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Omezit využití baterie sítí Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Pokud síť Wi‑Fi ztratí přístup k internetu, přepnout na mobilní data"</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Přepnutí na mobilní data"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Když síť Wi‑Fi ztratí přístup k internetu, přepnout na mobilní data. Mohou být účtovány dodatečné poplatky."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Přidat síť"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Sítě Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačítko WPS"</string>
@@ -782,14 +782,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PŘIPOJIT"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Tato síť nemá přístup k internetu. Chcete zůstat připojeni?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"U této sítě se již nedotazovat"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Síť Wi‑Fi nemá přístup k internetu"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Při špatném připojení Wi‑Fi můžete přepnout na mobilní síť. Mohou být účtovány poplatky za data."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Přepnout na mobilní data"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Zůstat na Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Již nikdy nezobrazovat"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
@@ -883,8 +880,7 @@
     <string name="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitost"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Hlasitost vyzvánění"</string>
@@ -956,22 +952,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od soumraku do úsvitu"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Čas zahájení"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončení"</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">"Vypnuto. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikdy se automaticky nezapne."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Zapne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Zapne se automaticky za soumraku."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Zapnuto. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikdy se automaticky nevypne."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Vypne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Vypne se automaticky za úsvitu."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1038,8 +1026,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verze systému Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Úroveň opravy zabezpečení Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID zařízení"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Verze základního pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verze jádra"</string>
@@ -1170,10 +1157,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Jiné"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Prozkoumat úložiště <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">"Mezi ostatní soubory patří sdílené soubory uložené aplikacemi, soubory stažené z internetu nebo přes Bluetooth, soubory systému Android apod. \n\nChcete-li zobrazit viditelný obsah tohoto úložiště typu <xliff:g id="NAME">^1</xliff:g>, klepněte na Prozkoumat."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Systém zahrnuje soubory, které Android nedokáže zobrazit samostatně."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> může mít uložené fotky, hudbu, filmy, aplikace a další data, která v úložišti zabírají <xliff:g id="SIZE">^2</xliff:g>. \n\nChcete-li zobrazit podrobnosti, přepněte na účet uživatele <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použít jako přenosné úložiště"</string>
@@ -2716,8 +2701,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Přístup při nastavení Nerušit"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"O přístup při nastavení Nerušit nepožádaly žádné nainstalované aplikace"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanály"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovat oznámení z této aplikace"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokovat vše"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Oznámení z tohoto kanálu nikdy nezobrazovat"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Přepsat nastavení Nerušit"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožnit těmto oznámením vyrušit mě, pokud je v nastavení Nerušit vybrána možnost Pouze prioritní"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na obrazovce uzamčení"</string>
@@ -2726,6 +2714,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Důvěrné"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Důležitost"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Vždy blikat kontrolkou oznámení"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vždy vibrovat"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Název pravidla"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Zadejte název pravidla"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Název pravidla je již používán."</string>
@@ -3153,8 +3143,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Omezení sítě"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operátor může data počítat jinak než zařízení"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Využito <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">"Nastavit upozornění na data"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozornění na data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastavit limit dat"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limit dat"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5c4ea21..f9dff22 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/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">"Lås op med fingeraftryk"</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">"Brug dit fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Du sætter blot fingeren på fingeraftrykslæseren for at låse telefonen op, godkende køb eller logge ind i apps. Vær forsigtig med, hvem du tilføjer. Selv ét fingeraftryk, der føjes til din telefon, kan gøre disse ting.\n\nBemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode."</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">"Du trykker blot på fingeraftrykslæseren for at godkende køb eller logge ind på apps. Vær forsigtig med, hvis fingeraftryk du tilføjer. Hvis du føjer en persons fingeraftryk til din telefon, kan denne person med blot ét fingeraftryk også gøre disse ting.\n\nBemærk! Du kan ikke bruge dit fingeraftryk til at låse enheden op. Kontakt din organisations administrator for at få flere oplysninger."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Du sætter blot fingeren på fingeraftrykslæseren for at låse telefonen op, godkende køb eller logge ind i apps. Vær forsigtig med, hvem du tilføjer. Hvis du føjer en persons fingeraftryk til din telefon, kan denne person med blot ét fingeraftryk også gøre disse ting.\n\nBemærk! Adgang via fingeraftryk kan være mindre sikkert end adgang via et stærkt mønster eller en stærk pinkode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuller"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsæt"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Startskærm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lydstyrke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Lydstyrke for ringetone"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Fra solnedgang til solopgang"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Starttidspunkt"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttidspunkt"</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">"Fra. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Aktiveres aldrig automatisk."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Aktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Aktiveres automatisk ved solnedgang."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Til. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Deaktiveres aldrig automatisk."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Deaktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Deaktiveres automatisk ved solopgang."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
     <string name="security_patch" msgid="8438384045870296634">"Niveau for sikkerhedsrettelse på Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Udstyrs-id"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basebandversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernesystem"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Andet"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Åbn <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">"Andre omfatter bl.a. delte filer, der er gemt af apps, filer, som er downloadet fra internettet eller via Bluetooth, og Android-filer. \n\nDu kan se synligt indhold på dette <xliff:g id="NAME">^1</xliff:g> ved at trykke på Udforsk."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Systemet omfatter filer, som Android ikke kan vise hver for sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan have gemt billeder, musik, film, apps og andre data, som bruger <xliff:g id="SIZE">^2</xliff:g> af lagerpladsen. \n\nFå flere oplysninger ved at skifte til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer dit <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Brug som ekstern lagerplads"</string>
@@ -2035,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +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>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <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 519a453..ded5c01 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -342,11 +342,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mit Fingerabdruck entsperren"</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">"Fingerabdruck verwenden"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, welche Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du zu deinem Smartphone hinzufügst.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine 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">"Tippe einfach auf den Fingerabdrucksensor, um Käufe zu autorisieren oder dich in Apps anzumelden. Überlege dir gut, wessen Fingerabdrücke du hinzufügst. Mit jedem hinzugefügten Fingerabdruck können alle diese Aktionen durchgeführt werden.\n\nHinweis: Dieses Gerät kann nicht mit deinem Fingerabdruck entsperrt werden. Weitere Informationen erhältst du vom Administrator deiner Organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, welche Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du zu deinem Smartphone hinzufügst.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Weiter"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Startseite"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Klingeltonlautstärke"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sonnenuntergang bis -aufgang"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Beginn"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ende"</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">"Aus. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Wird niemals automatisch aktiviert."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> aktiviert."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Wird bei Sonnenuntergang automatisch aktiviert."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"An. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Wird niemals automatisch deaktiviert."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> deaktiviert."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Wird bei Sonnenaufgang automatisch deaktiviert."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-Version"</string>
     <string name="security_patch" msgid="8438384045870296634">"Stand der Sicherheitsupdates"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modell"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Geräte-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-Version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-Version"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Andere"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> erkunden"</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">"\"Andere\" beinhaltet beispielsweise von Apps gespeicherte gemeinsam genutzte Dateien, aus dem Internet oder per Bluetooth heruntergeladene Dateien oder Android-Dateien. \n\nTippe zum Ansehen des gesamten Inhalts von <xliff:g id="NAME">^1</xliff:g> auf \"Erkunden\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"System umfasst Dateien, die Android nicht einzeln anzeigen kann."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kann Fotos, Musik, Filme, Apps oder sonstige Daten gespeichert haben, die <xliff:g id="SIZE">^2</xliff:g> Speicher belegen. \n\nWechsle zum Ansehen von Details zu <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> einrichten"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Als tragbaren Speicher verwenden"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3095,8 +3085,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Netzwerkbeschränkungen"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Datennutzung: <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">"Datenwarnung festlegen"</string>
     <string name="data_warning" msgid="209133958008062117">"Warnlimit für mobile Daten"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datenlimit festlegen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datenlimit"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 29d7001..64ab92c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Διαγραφή"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"Αναγνωριστικό εξοπλισμού"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Έκδοση βασικού φάσματος"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Έκδοση Kernel"</string>
@@ -1150,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">"Στην ενότητα \"Άλλα\" περιλαμβάνονται κοινόχρηστα αρχεία που έχουν αποθηκευτεί από εφαρμογές, αρχεία που έχετε κατεβάσει από το διαδίκτυο ή μέσω 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Χρήση ως φορητού αποθηκευτικού χώρου"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d219ccb..72e2210 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/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">"Unlock with fingerprint"</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">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <!-- 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">"Just touch the fingerprint sensor to authorise purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit battery used by Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Switch to mobile data if Wi‑Fi loses Internet access."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobile data fallback"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Use mobile data when Wi‑Fi loses Internet access. Additional charges may apply."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi networks"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"This network has no Internet access. Stay connected?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Don\'t ask again for this network"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi is not connected to the Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"You can switch to the cellular network whenever Wi‑Fi has a bad connection. Data usage may apply."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Switch to cellular"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Stay on Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Never show again"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Ring volume"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset to sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</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">"Off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Will never turn on automatically."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Will turn on automatically at sunset."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"On. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Will never turn off automatically."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Will turn off automatically at sunrise."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android security patch level"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Equipment ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <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">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the visible contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"System includes files that Android can’t display individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Channels"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Block all"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Never show notifications from this channel"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Done"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Always pulse notification light"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Always vibrate"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Enter rule name"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Rule name already in use"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Network restrictions"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operator data accounting may differ from device accounting"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Set data warning"</string>
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d219ccb..3cc1945 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/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">"Unlock with fingerprint"</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">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <!-- 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">"Just touch the fingerprint sensor to authorise purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit battery used by Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Switch to mobile data if Wi‑Fi loses Internet access."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobile data fallback"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Use mobile data when Wi‑Fi loses Internet access. Additional charges may apply."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi networks"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"This network has no Internet access. Stay connected?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Don\'t ask again for this network"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi is not connected to the Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"You can switch to the mobile network whenever Wi‑Fi has a bad connection. Data usage may apply."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Switch to mobile"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Stay on Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Never show again"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Ring volume"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset to sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</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">"Off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Will never turn on automatically."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Will turn on automatically at sunset."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"On. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Will never turn off automatically."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Will turn off automatically at sunrise."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android security patch level"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Equipment ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <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">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the visible contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"System includes files that Android can’t display individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Channels"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Block all"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Never show notifications from this channel"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Done"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Always pulse notification light"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Always vibrate"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Enter rule name"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Rule name already in use"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Network restrictions"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operator data accounting may differ from device accounting"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Set data warning"</string>
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d219ccb..3cc1945 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/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">"Unlock with fingerprint"</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">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <!-- 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">"Just touch the fingerprint sensor to authorise purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit battery used by Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Switch to mobile data if Wi‑Fi loses Internet access."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobile data fallback"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Use mobile data when Wi‑Fi loses Internet access. Additional charges may apply."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi networks"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"This network has no Internet access. Stay connected?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Don\'t ask again for this network"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi is not connected to the Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"You can switch to the mobile network whenever Wi‑Fi has a bad connection. Data usage may apply."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Switch to mobile"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Stay on Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Never show again"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Ring volume"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset to sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</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">"Off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Will never turn on automatically."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Will turn on automatically at sunset."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"On. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Will never turn off automatically."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Will turn off automatically at sunrise."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android security patch level"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Equipment ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <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">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the visible contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"System includes files that Android can’t display individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Channels"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Block all"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Never show notifications from this channel"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Done"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Always pulse notification light"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Always vibrate"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Rule name"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Enter rule name"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Rule name already in use"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Network restrictions"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operator data accounting may differ from device accounting"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Set data warning"</string>
     <string name="data_warning" msgid="209133958008062117">"Data warning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Set data limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cb2690a..b9c52b3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/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">"Usar huella digital"</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">"Usa tus huellas digitales"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo toca el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Tu huella digital puede ser menos segura que un PIN o un patrón eficaz."</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">"Toca el sensor de huellas digitales para autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Solo tienes que tocar el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Es posible que las huellas digitales sean menos seguras que un patrón o PIN eficaz."</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>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Página principal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de la música"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volumen de tono"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Del atardecer al amanecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</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">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No se activará 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_twilight" msgid="2737328390752018845">"Se activará automáticamente al atardecer."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No se desactivará 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_twilight" msgid="8574989770628425398">"Se desactivará automáticamente al amanecer."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivel de parche de seguridad de Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID del equipo"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión de núcleo"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Otro"</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>
-    <!-- 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">"Se incluyen los archivos compartidos que guardan las apps, los que se descargan por Internet y Bluetooth y los archivos de Android, entre otros. \n\nPara ver el contenido visible de este dispositivo de almacenamiento (<xliff:g id="NAME">^1</xliff:g>), presiona Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"El sistema incluye archivos que Android no puede mostrar de manera individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Es posible que el usuario <xliff:g id="USER_0">^1</xliff:g> haya guardado fotos, música, películas, aplicaciones u otros datos que ocupan <xliff:g id="SIZE">^2</xliff:g> de almacenamiento. \n\nPara ver los detalles, cambia al usuario <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar el dispositivo <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como medio de almacenamiento portátil"</string>
@@ -2670,8 +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>
+    <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>
+    <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>
@@ -2680,6 +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>
+    <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>
@@ -3091,8 +3081,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restricciones de red"</string>
     <string name="operator_warning" msgid="1862988028996859195">"El cálculo de datos de tu proveedor puede diferir del que hace tu dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Datos usados: <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">"Configurar advertencia"</string>
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Establecer límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 558e040..658bb7e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/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">"Desbloqueo con huella"</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">"Usar tu huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o 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">"Solo tienes que tocar el sensor de huellas digitales para autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, ponte en contacto con el administrador de tu organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o 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,6 +683,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar uso de batería con Wi-Fi activado"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limitar batería usada por Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Cambiar a conexión de datos móviles si se pierde el acceso a Internet a través de la red Wi-Fi."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Alternativa a la conexión de datos móviles"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utiliza la conexión de datos móviles si se pierde el acceso a Internet a través de la red Wi-Fi. Podrían aplicarse cargos adicionales."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Añadir red"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botón WPS"</string>
@@ -762,14 +762,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Esta red no permite acceder a Internet. ¿Quieres mantener la conexión?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"No volver a preguntar por esta red"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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">"Puedes activar la red de telefonía móvil cuando la conexión Wi-Fi no sea buena. Podrían aplicarse cargos por el uso de datos."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Cambiar a red móvil"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Mantener conexión 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">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
@@ -863,8 +860,7 @@
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de música"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volumen del tono"</string>
@@ -936,22 +932,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Amanecer/Anochecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</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">"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 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 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>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1016,8 +1004,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivel de parche de seguridad de Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID de equipo"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versión de la banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión del kernel"</string>
@@ -1148,10 +1135,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Otros"</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>
-    <!-- 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">"En Otros se incluyen los archivos compartidos que han guardado las aplicaciones, los archivos descargados de Internet o por Bluetooth, los archivos de Android, etc. \n\nPara ver el contenido visible de <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"El sistema incluye archivos que Android no puede mostrar de forma individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> puede tener aplicaciones, películas, música, fotos y otros datos guardados que ocupan un espacio de <xliff:g id="SIZE">^2</xliff:g>. \n\nPara ver información detallada, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como almacenamiento portátil"</string>
@@ -2670,8 +2655,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso de No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Canales"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloquear todo"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"No mostrar nunca notificaciones de este canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Priorizar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla de bloqueo"</string>
@@ -2680,6 +2668,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importancia"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Usar siempre LED de notificaciones"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrar siempre"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nombre de la regla"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Introduce un nombre"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nombre de regla ya en uso"</string>
@@ -3091,8 +3081,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restricciones de red"</string>
     <string name="operator_warning" msgid="1862988028996859195">"El uso de datos del operador puede ser diferente al calculado por el dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Datos usados: <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">"Definir advertencia de datos"</string>
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Establecer límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 78f37b9..c1eeb6a 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/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">"Sõrmejäljega avamine"</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">"Sõrmejälje kasutamine"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefoni avamiseks, ostude volitamiseks või rakendustesse sisse logimiseks peate vaid puudutama sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega.\n\nMärkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood."</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">"Ostude volitamiseks või rakendustesse sisselogimiseks peate puudutama vaid sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega.\n\nMärkus. Te ei saa sõrmejälge kasutada selle seadme avamiseks. Lisateabe saamiseks võtke ühendust organisatsiooni administraatoriga."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefoni avamiseks, ostude volitamiseks või rakendustesse sisse logimiseks peate vaid puudutama sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega.\n\nMärkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Tühista"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jätka"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimeeri aku kasutamine, kui WiFi on sees"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Piira WiFi akukasutust"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Kui WiFi kaotab juurdepääsu Internetile, lülita mobiiliandmesidele."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Tagasi mobiilsele andmesidele"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Kui WiFi kaotab juurdepääsu Internetile, kasutatakse mobiilset andmesidet. Kehtida võivad lisatasud."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Võrgu lisamine"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"WiFi-võrgud"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ÜHENDA"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Sellel võrgul puudub juurdepääs Internetile. Kas soovite ühenduse säilitada?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ära selle võrgu puhul uuesti küsi"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"WiFi pole Internetiga ühendatud"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Kui WiFi-ühendus on kehv, saate lülituda mobiilsidevõrku. Andmekasutus võib olla tasuline."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Lülitu mobiilsidevõrku"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Kasuta edasi WiFi-t"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ära näita enam kunagi"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Avaekraan"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekraan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Helitugevused"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muusikaefektid"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Helina helitugevus"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Loojangust päikesetõusuni"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Algusaeg"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Lõppaeg"</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">"Väljas. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ei lülitu kunagi automaatselt sisse."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Lülitub automaatselt sisse kell <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Lülitub automaatselt sisse päikeseloojangul."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Sees. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ei lülitu kunagi automaatselt välja."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Lülitub automaatselt välja kell <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Lülitub automaatselt välja päikesetõusu ajal."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Androidi versioon"</string>
     <string name="security_patch" msgid="8438384045870296634">"Androidi turvapaiga tase"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Mudel"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Seadme ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Põhiribaversioon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Tuuma versioon"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Muu"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Süsteem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Üksuse <xliff:g id="NAME">^1</xliff:g> avastamine"</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">"Muu hõlmab rakenduste salvestatud jagatud faile, Internetist või Bluetoothi kaudu allalaaditud faile, Androidi faile jne. \n\nSeadmes <xliff:g id="NAME">^1</xliff:g> nähtava sisu nägemiseks puudutage nuppu Avastage."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Süsteem sisaldab faile, mida Android ei saa eraldi kuvada."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Kasutaja <xliff:g id="USER_0">^1</xliff:g> võib olla salvestanud fotosid, muusikat, filme, rakendusi või teisi andmeid, mis võtavad ruumi <xliff:g id="SIZE">^2</xliff:g>. \n\nÜksikasjade vaatamiseks lülitage kasutajale <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Seadista üksus <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Kasuta kaasaskantava salvestusruumina"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Juurdepääs funktsioonile Mitte segada"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ükski installitud rakendus pole palunud juurdepääsu funktsioonile Mitte segada"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanalid"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ära kuva kunagi selle rakenduse märguandeid"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokeeri kõik"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Ära kunagi näita selle kanali märguandeid"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Funktsiooni Mitte segada alistamine"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukustuskuval"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Tundlik"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Tähtsus"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Märguande tuli vilgub alati"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibreerib alati"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Reegli nimi"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Reegli nime sisestamine"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Reegli nimi on juba kasutusel"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Võrgupiirangud"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operaatori andmemahuarvestus võib erineda seadme andmemahuarvestusest"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_warning" msgid="209133958008062117">"Andmemahu hoiatus"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Andmemahupiirangu määramine"</string>
     <string name="data_limit" msgid="1885406964934590552">"Andmemahu piirang"</string>

diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 190e039..c976f23 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/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">"Desblokeatu hatz-marka bidez"</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">"Erabili hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun. Hatz-marka bakar bat gehituta ere gauza daitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-marka ez izatea eredu edo PIN kode konplexu bat bezain segurua."</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">"Ukitu hatz-marken sentsorea erosketak baimentzeko edo aplikazioetan saioa hasteko. Erne noren hatz-markak gehitzen dituzun; gehitzen duzun edozein hatz-markarekin egin ahal izango baitituzu ekintza horiek.\n\nOharra: ezin duzu erabili hatz-marka gailua desblokeatzeko. Informazio gehiago lortzeko, jarri erakundearen administratzailearekin harremanetan."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun. Hatz-marka bakar bat gehituta ere gauza daitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-marka ez izatea eredu edo PIN kode konplexu bat bezain segurua."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Utzi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jarraitu"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Murriztu bateriaren erabilera Wi-Fi konexioa aktibatuta dagoenean"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Mugatu Wi‑Fi bidezko bateria-kontsumoa"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Aldatu datu-konexiora Wi-Fi konexioa galtzen bada."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Erabili datu-konexioa Wi‑Fi konexioak funtzionatzen ez badu"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Erabili datu-konexioa Wi‑Fi sarea Internetera konektatu ezinik geratzen bada. Datu-erabilera ordaindu behar izan dezakezu."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Gehitu sarea"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi sareak"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push botoia"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KONEKTATU"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Sare hau ezin da konektatu Internetera. Konektatuta jarraitu nahi duzu?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ez galdetu berriro sarea hau bada"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi sarea ez dago Internetera konektatuta"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Datu-konexioa erabil dezakezu Wi-Fi sareak konexio txarra badu. Datu-erabilera ordaindu behar izan dezakezu."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Erabili datu-konexioa"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Jarraitu Wi‑Fi konexioa erabiltzen"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ez erakutsi berriro"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Konektatu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ezin izan da sarera konektatu"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Ahaztu"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Hasiera"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Bolumenak"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musika-efektuak"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Tonuaren bolumena"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Iluntzetik egunsentira"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hasiera-ordua"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Amaiera-ordua"</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">"Desaktibatuta. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ez da inoiz aktibatuko automatikoki."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ordu honetan aktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Iluntzean aktibatuko da automatikoki."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktibatuta. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ez da inoiz desaktibatuko automatikoki."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Ordu honetan desaktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Egunsentian desaktibatuko da automatikoki."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android bertsioa"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android segurtasunaren adabaki-maila"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modeloa"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Ekipoaren IDa"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Oinarri-bandaren bertsioa"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel bertsioa"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Beste datu batzuk"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Arakatu <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">"Hauek dira \"Beste fitxategi batzuk\" atalean gordetzen diren fitxategiak: aplikazioek gordetako fitxategi partekatuak, Internetetik edo Bluetooth konexioaren bidez deskargatutakoak, Android fitxategiak, etab. \n\n <xliff:g id="NAME">^1</xliff:g> honetan ikusgai dagoen edukia ikusteko, sakatu Arakatu."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Android-ek banaka bistaratu ezin dituen fitxategiak daude Sistema atalean."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Baliteke <xliff:g id="USER_0">^1</xliff:g> erabiltzaileak memoriaren <xliff:g id="SIZE">^2</xliff:g> baino gehiago betetzen duten argazkiak, musika, filmak, aplikazioak edo bestelako datuak gorde izana. \n\nXehetasunak ikusteko, hasi saioa <xliff:g id="USER_1">^1</xliff:g> gisa."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguratu <xliff:g id="NAME">^1</xliff:g> memoria"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Erabili biltegiratze-gailu eramangarri gisa"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Ez molestatu\" aukerarako sarbidea"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanalak"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ez erakutsi inoiz aplikazio honen jakinarazpenak"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokeatu guztiak"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Ez erakutsi inoiz kanal honen jakinarazpenak"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Ez molestatu\" moduaren salbuespenak"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pantaila blokeatuan"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Isilpekoa"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Eginda"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Garrantzia"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Erakutsi jakinarazpenen argi keinukaria beti"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Egin dardara beti"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Arauaren izena"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Idatzi arauaren izena"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Beste nonbait erabiltzen ari da arau-izen hori"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Sarearen mugak"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Agian ez dira bat etorriko gailuak eta operadoreak egindako datu-kontsumoen neurketak"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> erabili dira"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Ezarri datuen erabileraren abisua"</string>
     <string name="data_warning" msgid="209133958008062117">"Datuen erabileraren abisua"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ezarri datuen muga"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datuen muga"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 47b7302..4dea437 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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توجه: ممکن است اثر انگشت از الگو یا پین قدرتمند امنیت کمتری داشته باشد."</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توجه: ممکن است امنیت اثر انگشت از الگو یا کد پین قوی کمتر باشد."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"لغو"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ادامه"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"شناسه دستگاه"</string>
     <string name="baseband_version" msgid="1848990160763524801">"نسخهٔ باند پایه"</string>
     <string name="kernel_version" msgid="9192574954196167602">"نسخهٔ اصلی"</string>
@@ -1150,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>
@@ -1435,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>
@@ -2140,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -2776,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>
@@ -3093,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-fi/strings.xml b/res/values-fi/strings.xml
index 3292d1c..b9497f9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/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">"Avaa sormenjäljellä"</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">"Sormenjäljen käyttäminen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Avaa puhelimen lukitus, hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkitunnistinta. Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat vain yhdellä laitteeseen lisätyllä sormenjäljellä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</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">"Hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkianturia. Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat kaikilla laitteeseen lisätyillä sormenjäljillä.\n\nHuom. Tämän laitteen lukitusta ei voi avata sormenjäljellä. Saat lisätietoja organisaatiosi järjestelmänvalvojalta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Avaa puhelimen lukitus, hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkitunnistinta. Ole varovainen lisätessäsi sormenjälkiä – nämä toiminnot onnistuvat vain yhdellä laitteeseen lisätyllä sormenjäljellä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Peruuta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jatka"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"YHDISTÄ"</string>
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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. Datan siirtämisestä voi aiheutua maksuja."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Vaihda mobiilidataan"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Etusivu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Äänenvoimakkuudet"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiikkitehosteet"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Soittoäänen voimakkuus"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Auringonlaskusta sen nousuun"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Alkamisaika"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Päättymisaika"</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">"Pois päältä: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Älä koskaan käynnistä automaattisesti"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Käynnistä automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Käynnistä automaattisesti, kun aurinko laskee"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Päällä: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Älä koskaan sammuta automaattisesti"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sammuta automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sammuta automaattisesti, kun aurinko nousee"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Siirtyminen virransäästöön"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versio"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android-tietoturvakorjauksen taso"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Malli"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Varustetunnus"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-versio"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versio"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Muu"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Järjestelmä"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Tutki: <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">"Muut-luokkaan kuulu esim. sovellusten tallentamia jaettuja tiedostoja, verkosta ladattuja tiedostoja, Bluetooth- tai Android-tiedostoja.\n\nKatso kohteen <xliff:g id="NAME">^1</xliff:g> näkyvä sisältö valitsemalla Tutki."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Android ei voi näyttää kaikkia järjestelmätiedostoja yksitellen."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> voi sisältää tallennettuja valokuvia, musiikkia, elokuvia, sovelluksia tai muita tietoja, jotka vievät <xliff:g id="SIZE">^2</xliff:g> tallennustilaa. \n\nJos haluat nähdä tarkemmat tiedot, valitse <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Määritä <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Käytä kannettavana tallennustilana"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Verkkorajoitukset"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operaattorin mittaama datan määrä voi erota laitteen mittaustuloksesta."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Aseta datankäyttövaroitus"</string>
     <string name="data_warning" msgid="209133958008062117">"Datavaroitus"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Aseta tiedonsiirtoraja"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datankäyttöraja"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 71349a5..fd7e272 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/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">"Déverrouillage avec empreinte"</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">"Utilisez empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</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">"Il suffit de toucher le capteur d\'empreintes digitales pour autoriser les achats ou vous connecter à des applications. Soyez prudent d\'ajouter uniquement les empreintes digitales de personnes en qui vous avez confiance. Même une seule empreinte ajoutée peut effectuer toutes ces actions.\n\nRemarque : Vous ne pouvez pas utiliser vos empreintes digitales pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un NIP fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNEXION"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ce réseau ne dispose d\'aucun accès à Internet. Voulez-vous quand même l\'utiliser?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne plus me demander pour ce réseau"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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 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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Supprimer"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume de la sonnerie"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Du coucher au lever du soleil"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Heure de début"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</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">"Désactivé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ne s\'activera jamais automatiquement"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"S\'active automatiquement au coucher du soleil."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ne se désactivera jamais automatiquement"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se désactivera automatiquement au lever du soleil"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1018,12 +1006,11 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Version d\'Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Niveau du correctif de sécurité Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modèle"</string>
     <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>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer « <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">"Les autres fichiers comprennent les fichiers partagés enregistrés par les applications, les fichiers téléchargés d\'Internet ou par Bluetooth, les fichiers systèmes d\'Android et ainsi de suite.\n\nPour voir le contenu visible de cet appareil « <xliff:g id="NAME">^1</xliff:g> », touchez Explorer."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Le système comprend des fichiers qu\'Android ne peut pas afficher individuellement."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"L\'utilisateur « <xliff:g id="USER_0">^1</xliff:g> » a peut-être enregistré des photos, de la musique, des films, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte d\'utilisateur « <xliff:g id="USER_1">^1</xliff:g> »."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer votre « <xliff:g id="NAME">^1</xliff:g> »"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
@@ -2002,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>
@@ -2625,7 +2610,7 @@
     <string name="configure_notification_settings" msgid="3558846607192693233">"Configurer les notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Faire clignoter le voyant de notification"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"À l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restrictions réseau"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Définir avertiss. util. données"</string>
     <string name="data_warning" msgid="209133958008062117">"Avertissement consomm. données"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir limite consomm. données"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5dc2b18..1db3c62 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/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">"Déverrouillage avec empreinte"</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">"Utiliser votre empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</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">"Il vous suffit d\'appuyer sur le lecteur d\'empreinte digitale pour autoriser les achats ou vous connecter aux applications. Toutes les personnes dont les empreintes digitales sont ajoutées peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin.\n\nRemarque : vous ne pouvez pas utiliser votre empreinte digitale pour déverrouiller cet appareil. Pour plus d\'informations, contactez l\'administrateur de votre organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume de la sonnerie"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Du coucher au lever du soleil"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Heure de début"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</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">"Désactivé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ne jamais activer automatiquement"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Activer automatiquement au coucher du soleil"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ne jamais désactiver automatiquement"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Désactiver automatiquement au lever du soleil"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Version d\'Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Niveau du correctif de sécurité Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modèle"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID de l\'équipement"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Version de bande de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Version du noyau"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer la mémoire de stockage \"<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">"Le libellé \"Autre\" fait référence aux fichiers partagés enregistrés par les applications, aux fichiers téléchargés sur Internet ou via le Bluetooth, aux fichiers Android, etc. \n\nPour afficher l\'intégralité du contenu de la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\", appuyez sur \"Explorer\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Le système comprend des fichiers qu\'Android ne peut pas afficher individuellement."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"L\'utilisateur \"<xliff:g id="USER_0">^1</xliff:g>\" a peut-être enregistré des photos, de la musique, des films, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte utilisateur \"<xliff:g id="USER_1">^1</xliff:g>\"."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer la mémoire \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restrictions sur le réseau"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Le suivi de la consommation effectué par votre opérateur peut différer de celui effectué sur votre appareil."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s)"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Définir une alerte de données"</string>
     <string name="data_warning" msgid="209133958008062117">"Avertissement conso données"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir une limite de données"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de consommation données"</string>

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 4114278..1d5e2de 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/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">"Desbloquear coa impresión dixital"</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">"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>
-    <!-- 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">"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>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Estar rede non ten acceso a Internet. Queres manter a conexión?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Non volver preguntar por esta rede"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos musicais"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume do timbre"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do anoitecer ao amencer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</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">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca se activará automaticamente."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Activarase automaticamente ás <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Activarase automaticamente ao anoitecer."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca se desactivará automaticamente."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Desactivarase automaticamente ás <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Desactivarase automaticamente ao amencer."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensión"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivel de parche de seguranza de Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID de equipamento"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión de kernel"</string>
@@ -1150,10 +1137,8 @@
     <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>
-    <!-- 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">"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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como almacenamento portátil"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restricións de rede"</string>
     <string name="operator_warning" msgid="1862988028996859195">"A maneira na que o operador contabiliza os datos usados pode ser diferente á do dispositivo."</string>
     <string name="data_used_template" msgid="3245919669966296505">"Datos usados: <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">"Definir advertencia de datos"</string>
     <string name="data_warning" msgid="209133958008062117">"Aviso de datos"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir límite de datos"</string>
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 2675220..e9a1e6e 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"ભૂલી જાઓ"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"પોર્ટેબલ સંગ્રહ તરીકે ઉપયોગ કરો"</string>
@@ -2674,8 +2659,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>
+    <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>
+    <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>
@@ -2684,6 +2672,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>
+    <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>
@@ -3095,8 +3085,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-hi/strings.xml b/res/values-hi/strings.xml
index 0dc7d54..8d2b3b8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/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नोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</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नोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी रखें"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"वाई-फ़ाई इंटरनेट से नहीं जुड़ा है"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"जब भी वाई-फ़ाई का कनेक्शन खराब हो तो आप सेल्युलर नेटवर्क पर जा सकते हैं. डेटा उपयोग लागू हो सकता है."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"सेल्युलर पर जाएं"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"डिवाइस आईडी"</string>
     <string name="baseband_version" msgid="1848990160763524801">"बेसबैंड वर्ज़न"</string>
     <string name="kernel_version" msgid="9192574954196167602">"कर्नेल वर्ज़न"</string>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-hr/strings.xml b/res/values-hr/strings.xml
index f4d4278..0e3edcc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -346,11 +346,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom"</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">"Upotreba otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: otisak prsta nije toliko siguran kao snažan uzorak ili 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">"Jednostavno dodirnite senzor otiska prsta da biste autorizirali kupnje ili se prijavili u aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: ovaj uređaj ne možete otključati otiskom prsta. Više informacija možete dobiti od administratora u svojoj organizaciji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: otisak prsta nije toliko siguran kao snažan uzorak ili PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
@@ -696,6 +694,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiziraj potrošnju baterije kad je Wi-Fi uključen"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Ograniči bateriju za Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Prijeđi na mobilni prijenos ako Wi‑Fi izgubiti pristup internetu."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Prebacivanje na mobilnu mrežu"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Prijeđi na mobilnu mrežu kada Wi‑Fi izgubi pristup internetu. Moguća je dodatna naplata."</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 gumb"</string>
@@ -773,14 +773,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
@@ -874,8 +871,7 @@
     <string name="home_settings" msgid="212375129455718176">"Početna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Glasnoća zvona"</string>
@@ -947,22 +943,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od zalaska do izlaska sunca"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vrijeme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vrijeme završetka"</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">"Isključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikad se ne uključuje automatski."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Uključuje se automatski kad sunce zađe."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Uključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikad se ne isključuje automatski."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Isključuje se automatski kad sunce izađe."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kada prođe <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1028,8 +1016,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzija sustava Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Razina Androidove sigurnosne zakrpe"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID opreme"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Osnovna verzija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
@@ -1160,10 +1147,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Ostalo"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sustav"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži <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">"Ostalo uključuje dijeljene datoteke koje su spremile aplikacije, datoteke preuzete s interneta ili Bluetoothom, Android datoteke i tako dalje. \n\nDa biste vidjeli što sadrži <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sustav uključuje datoteke koje Android ne može prikazati pojedinačno."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Korisnik <xliff:g id="USER_0">^1</xliff:g> možda ima spremljene fotografije, glazbu, filmove, aplikacije ili druge podatke koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> prostora za pohranu. \n\nZa prikaz pojedinosti prijeđite na korisnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Postavite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Upotrebljavaj kao prijenosnu pohranu"</string>
@@ -2153,7 +2138,7 @@
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podaci i sinkronizacija"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Promijeni zaporku"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Postavke računa"</string>
-    <string name="remove_account_label" msgid="5921986026504804119">"Brisanje računa"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Izbriši račun"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"Dodavanje računa"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Završi"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Ukloniti račun?"</string>
@@ -2694,8 +2679,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
+    <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 obavijesti te aplikacije"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokiraj sve"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nikad ne prikazuj obavijesti tog kanala"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom zaslonu"</string>
@@ -2704,6 +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">"Važnost"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Neka žaruljica obavijesti uvijek treperi"</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">"Naziv pravila već se upotrebljava"</string>
@@ -3123,8 +3113,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Potrošili ste <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">"Postavi upozorenje o podacima"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje podataka"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje podataka"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 371b96e..d7595ba 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/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">"Feloldás ujjlenyomattal"</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">"Az ujjlenyomat használata"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt telefonja feloldásához, a vásárlások engedélyezéséhez vagy az alkalmazásokba való bejelentkezéshez. Akár egyetlen hozzáadott ujjlenyomat képes mindezek végrehajtására, ezért fontolja meg, hogy kinek az ujjlenyomatát adja hozzá.\n\nMegjegyzés: Előfordulhat, hogy az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</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">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt a vásárlások engedélyezéséhez, illetve az alkalmazásokba való bejelentkezéshez. Akár egyetlen hozzáadott ujjlenyomat képes mindezek végrehajtására, ezért fontolja meg, hogy kinek az ujjlenyomatát adja hozzá.\n\nMegjegyzés: Az ujjlenyomat az eszköz feloldására nem használható. Ha további információt szeretne kapni, forduljon szervezete rendszergazdájához."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt telefonja feloldásához, a vásárlások engedélyezéséhez vagy az alkalmazásokba való bejelentkezéshez. Ügyeljen arra, hogy kinek az ujjlenyomatát adja hozzá az eszközhöz. A megadott ujjlenyomatok feljogosítják tulajdonosukat a felsoroltakra.\n\nMegjegyzés: Előfordulhat, hogy az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tovább"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Az akkumulátorhasználat minimalizálása, ha a Wi-Fi be van kapcsolva"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi akkuhasználat korlátozása"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Váltás mobiladat-használatra, ha a Wi-Fi-kapcsolata megszakad."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobiladat-kapcsolat használata tartalékként"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Mobiladat-kapcsolat használata, ha a Wi-Fi elveszíti az internetkapcsolatot. Ez költségekkel járhat."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Hálózat hozzáadása"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi hálózatok"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gomb"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KAPCSOLÓDÁS"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"A hálózaton nincs internetkapcsolat. Fenn szeretné tartani a kapcsolatot?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne kérdezzen rá újra ennél a hálózatnál"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"A Wi-Fi-hálózat nem csatlakozik az internethez."</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Gyenge Wi-Fi-kapcsolat esetén átválthat a mobilhálózat használatára. Ez esetben előfordulhat, hogy a szolgáltató adathasználati díjat számít fel."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Váltás mobilhálózatra"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Maradjon a Wi-Fi-hálózaton"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ne jelenjen meg többé"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Főoldal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hangerő"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Zenei hatások"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Csengés hangereje"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Napnyugtától napkeltéig"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Kezdés ideje"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Befejezés ideje"</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">"Ki. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Soha nem kapcsol be automatikusan."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Automatikusan bekapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Automatikusan bekapcsol napnyugtakor."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Be. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Soha nem kapcsol ki automatikusan."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Automatikusan kikapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Automatikusan kikapcsol napkeltekor."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android verziója"</string>
     <string name="security_patch" msgid="8438384045870296634">"Androidos biztonsági hibajavító csomag szintje"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modell"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Eszközazonosító"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Alapsáv verziója"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel verziója"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Egyéb"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Rendszer"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> felfedezése"</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">"Az Egyéb kategóriába tartoznak az alkalmazások által mentett megosztott fájlok, az internetről, illetve Bluetooth-kapcsolaton keresztül letöltött fájlok, az androidos fájlok stb. \n\nAz adathordozó (<xliff:g id="NAME">^1</xliff:g>) látható tartalmainak megtekintéséhez koppintson a Felfedezés lehetőségre."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"A Rendszer kategória olyan fájlokat tartalmaz, amelyeket az Android nem képes egyenként megjeleníteni."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"A(z) <xliff:g id="USER_0">^1</xliff:g> által esetlegesen mentett fotók, zenék, filmek, alkalmazások és más adatok <xliff:g id="SIZE">^2</xliff:g> tárhelyet foglalnak. \n\nA részletek megtekintéséhez váltson át <xliff:g id="USER_1">^1</xliff:g> felhasználóra."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> – beállítás"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Használat hordozható tárolóként"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ne zavarjanak” elérés"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Egy telepített alkalmazás sem kért „Ne zavarjanak” elérést"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Csatornák"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Soha ne jelenjenek meg az alkalmazás értesítései"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Az összes letiltása"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Soha ne jelenjen meg értesítés erről a csatornáról"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"A Ne zavarjanak mód felülbírálása"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"A Ne zavarjanak mód „Csak prioritásos” beállítása esetén ezek az értesítések továbbra is zavarhatnak"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A lezárási képernyőn"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Bizalmas"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kész"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Fontosság"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Mindig használjon villogó értesítő fényt"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Mindig rezegjen"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Szabály neve"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Szabály nevének megadása"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"A szabálynév már használatban van"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Hálózati korlátozások"</string>
     <string name="operator_warning" msgid="1862988028996859195">"A szolgáltató adatszámlálási módja eltérhet az eszközétől"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Adatforgalmi figyelmeztetés beállítása"</string>
     <string name="data_warning" msgid="209133958008062117">"Adatforgalmi figyelmeztetés"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Adatkorlát beállítása"</string>
     <string name="data_limit" msgid="1885406964934590552">"Adatforgalmi korlátozás"</string>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 7e83e53..6440c2e 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Մոռանալ"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"Baseband տարբերակ"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Միջուկի տարբերակ"</string>
@@ -1150,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">"Այլ ֆայլերը ներառում են հավելվածների կողմից պահված ընդհանուր օգտագործման ֆայլերը, համացանցից կամ 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Օգտագործել որպես շարժական պահեստ"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-in/strings.xml b/res/values-in/strings.xml
index b1fd4c9..db9689c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/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">"Membuka kunci dengan sidik jari"</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">"Menggunakan sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Cukup sentuh sensor sidik jari untuk membuka kunci perangkat, mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Sidik jari mungkin kurang aman dibanding pola atau PIN yang rumit."</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">"Cukup sentuh sensor sidik jari untuk mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Anda tidak dapat menggunakan sidik jari untuk membuka kunci perangkat ini. Untuk informasi selengkapnya, hubungi admin organisasi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Cukup sentuh sensor sidik jari untuk membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Sidik jari mungkin kurang aman dibanding pola atau PIN yang rumit."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Lanjutkan"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Beranda"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efek musik"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume dering"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Matahari terbenam s.d. terbit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Waktu mulai"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Waktu selesai"</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">"Nonaktif. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Tidak akan aktif otomatis."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Akan aktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Akan aktif otomatis saat matahari terbenam."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktif. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Tidak akan nonaktif otomatis."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Akan nonaktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Akan nonaktif otomatis saat matahari terbit."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Tingkat patch keamanan Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID Peralatan"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versi pita basis"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Lainnya"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Jelajahi <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">"Lainnya meliputi file bersama yang disimpan oleh aplikasi, file yang diunduh dari internet atau Bluetooth, file Android, dan sebagainya. \n\nUntuk melihat konten yang terlihat dari <xliff:g id="NAME">^1</xliff:g> ini, tap Jelajahi."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem meliputi file yang tidak dapat ditampilkan Android satu per satu."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, musik, film, aplikasi atau data lain yang menghabiskan <xliff:g id="SIZE">^2</xliff:g> penyimpanan. \n\nUntuk melihat detailnya, beralihlah ke <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Siapkan <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai penyimpanan portabel"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Batasan jaringan"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Penghitungan data operator dapat berbeda dengan penghitungan perangkat"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Setel peringatan data"</string>
     <string name="data_warning" msgid="209133958008062117">"Peringatan data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setel batas data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Batas data"</string>

diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index cc598e5..697a104 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/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">"Opna með fingrafari"</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">"Nota fingrafarið þitt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Snertu fingrafaralesarann til að opna símann, heimila kaup eða skrá þig inn á forrit. Hafðu gát á því hverjum þú leyfir að bæta við fingraförum. Hvert fingrafar sem bætt er við nægir til að gera allt það sem upp var talið.\n\nAthugið: Minna öryggi gæti verið með því að nota fingrafar heldur en ef notast er við sterkt mynstur eða PIN-númer."</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">"Snertu einfaldlega fingrafaralesarann til að heimila kaup eða skrá þig inn á forrit. Gættu vel að því hvaða fingraförum þú bætir við. Eitt fingrafar sem er bætt við getur gert allt þetta.\n\nAthugaðu: Þú getur ekki notað fingrafarið til að taka lásinn af þessu tæki. Hafðu samband við kerfisstjóra fyrirtækisins þíns til að fá frekari upplýsingar."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Snertu fingrafaralesarann til að opna símann, heimila kaup eða skrá þig inn í forrit. Farðu varlega þegar þú leyfir öðrum að bæta við fingraförum. Hvert fingrafar sem bætt er við dugir til að gera allt það sem upp var talið.\n\nAthugaðu: Fingrafarið er hugsanlega ekki eins öruggt og öflugt mynstur eða PIN-númer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hætta við"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Halda áfram"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"TENGJA"</string>
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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ð verða tekin fyrir gagnanotkun."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Skipta yfir í farsímakerfi"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Gleyma"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Heim"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjár"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hljóð"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hljóðstyrkur"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Tónlistaráhrif"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Hljóðstyrkur hringingar"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sólsetur til sólarupprásar"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Upphafstími"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Lokatími"</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">"Slökkt. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Kveikir aldrei sjálfkrafa."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Kveikir sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Kveikir sjálfkrafa við sólsetur."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Kveikt. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Slekkur aldrei sjálfkrafa."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Slekkur sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Slekkur sjálfkrafa við sólarupprás."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvíld"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android útgáfa"</string>
     <string name="security_patch" msgid="8438384045870296634">"Stig Android öryggisplásturs"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Gerð"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Auðkenni búnaðar"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Grunnbandsútgáfa"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjarnaútgáfa"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Annað"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Kerfi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Kanna <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">"Annað felur í sér skrár sem hefur verið deilt og forrit hafa vistað, skrár sem voru sóttar af internetinu eða með Bluetooth, Android skrár og svo framvegis. \n\nÝttu á „Kanna“ til að sjá sýnilegt innihald þessa <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Kerfi inniheldur skrár sem Android getur ekki birt sér."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kann að hafa vistað myndir, tónlist, kvikmyndir, forrit eða önnur gögn sem nota <xliff:g id="SIZE">^2</xliff:g> af geymslurými. \n\nTil að sjá nánari upplýsingar skaltu skipta yfir á <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setja upp <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Nota sem færanlega geymslu"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Takmarkanir nets"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Gögn símafyrirtækisins kunna að vera önnur en tækið sýnir"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> notuð"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Stilla gagnaviðvörun"</string>
     <string name="data_warning" msgid="209133958008062117">"Gagnaviðvörun"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Velja gagnatakmörk"</string>
     <string name="data_limit" msgid="1885406964934590552">"Gagnamörk"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5664460..28abc88 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/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">"Sblocca con l\'impronta"</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">"Usa la tua impronta digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</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">"Tocca il sensore di impronte digitali per autorizzare gli acquisti o per accedere alle app. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. Non puoi utilizzare la tua impronta per sbloccare il dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Riduci al minimo l\'utilizzo della batteria quando Wi‑Fi è attivo"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limita batteria usata da Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Passa a rete dati se il Wi-Fi perde l\'accesso a Internet"</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Passaggio a dati cellulari, se necessario"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utilizza i dati cellulari quando la rete Wi-Fi perde l\'accesso a Internet. Ciò può comportare costi aggiuntivi."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Aggiungi rete"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Reti Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsante di comando WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNETTI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Questa rete non ha accesso a Internet. Desideri restare connesso?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Non chiedermelo più per questa rete"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi non connesso a Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Puoi passare alla rete cellulare in caso di problemi con la connessione Wi-Fi. Potrebbero essere applicati costi per l\'utilizzo dei dati."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Passa alla rete cellulare"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Resta sulla rete Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Non mostrare più"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Home page"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effetti musicali"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume suoneria"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Dal tramonto all\'alba"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Ora inizio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ora fine"</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">"Disattivata. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Non verrà mai attivata automaticamente."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Verrà attivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Verrà attivata automaticamente al tramonto."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Attiva. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Non verrà mai disattivata automaticamente."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Verrà disattivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Verrà disattivata automaticamente al tramonto."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versione di Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Livello patch di sicurezza Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modello"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID attrezzatura"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versione banda di base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versione kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Altro"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Esplora <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">"In Altro sono inclusi file condivisi salvati dalle app, file scaricati da Internet o tramite Bluetooth, file Android e così via. \n\nPer vedere i contenuti visibili di <xliff:g id="NAME">^1</xliff:g>, tocca Esplora."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Il sistema include file che non è possibile visualizzare singolarmente su Android."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> potrebbe aver salvato foto, musica, film, app o altri dati che occupano <xliff:g id="SIZE">^2</xliff:g> di memoria. \n\nPer i dettagli, passa a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura la tua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizza come memoria portatile"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesso Non disturbare"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Canali"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrare mai notifiche di questa app"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blocca tutto"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Non mostrare mai le notifiche di questo canale"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora Non disturbare"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti interruzione per queste notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Nella schermata di blocco"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Riservate"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fine"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importanza"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Luce intermittente sempre attiva"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrazione sempre attiva"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome regola"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Inserisci il nome della regola"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nome regola già in uso"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Limitazioni di rete"</string>
     <string name="operator_warning" msgid="1862988028996859195">"I dati dell\'operatore potrebbero differire da quelli del dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Dati utilizzati: <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">"Imposta avviso sui dati"</string>
     <string name="data_warning" msgid="209133958008062117">"Avviso relativo ai dati"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Imposta limite dati"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite dati"</string>

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

@@ -349,11 +349,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שים לב: ייתכן ששימוש בטביעת אצבע יעניק פחות אבטחה מקו ביטול נעילה או מקוד גישה חזקים."</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שים לב: ייתכן ששימוש בטביעת אצבע יעניק פחות אבטחה מאשר קו ביטול נעילה או קוד גישה חזקים."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"בטל"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"המשך"</string>
@@ -705,6 +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>
+    <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>
@@ -782,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
@@ -883,8 +880,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>
@@ -956,22 +952,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>
@@ -1038,8 +1026,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">"זיהוי ציוד"</string>
     <string name="baseband_version" msgid="1848990160763524801">"גרסת פס בסיס"</string>
     <string name="kernel_version" msgid="9192574954196167602">"גרסת ליבה"</string>
@@ -1170,10 +1157,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">"‏קבצים אחרים כוללים, בין השאר, קבצים משותפים שנשמרו על-ידי אפליקציות, קבצים שהורדו מהאינטרנט או באמצעות 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"שימוש כאחסון נייד"</string>
@@ -2718,8 +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>
+    <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>
+    <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>
@@ -2728,6 +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>
+    <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>
@@ -3155,8 +3145,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-ja/strings.xml b/res/values-ja/strings.xml
index c971327..36bf261 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/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,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-FiがONのときに電池使用を節約する"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi-Fiの電池使用量を制限する"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi-Fiがインターネットにアクセスできない場合にモバイルデータに切り替える"</string>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"削除"</string>
@@ -865,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>
@@ -938,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">"OFF: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"自動で ON にしない"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"自動的に ON: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"自動的に ON: 日の入り"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"ON: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"自動で OFF にしない"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"自動的に OFF: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"自動的に OFF: 日の出"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -1018,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>
@@ -1150,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">"その他のファイルには、アプリが保存した共有ファイル、インターネットや 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"外部ストレージとして使用"</string>
@@ -2676,8 +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>
+    <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>
+    <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>
@@ -2686,6 +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>
+    <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>
@@ -3097,8 +3087,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-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 29903e9..ac585ad 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"წაშლა"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"Baseband-ის ვერსია"</string>
     <string name="kernel_version" msgid="9192574954196167602">"kernel-ის ვერსია"</string>
@@ -1150,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">"სხვა მოიცავს აპების მიერ შენახულ გაზიარებულ ფაილებს, ინტერნეტიდან ან 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"პორტატულ საცავად გამოყენება"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index c6a47b8..f2613b5 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Ұмыту"</string>
@@ -865,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">"Mузыка әсерлері"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Қоңыраудың дыбыс деңгейі"</string>
@@ -938,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>
@@ -1018,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">"Жабдық ЖА"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Радиомодуль нұсқасы"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Ядро нұсқасы"</string>
@@ -1150,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">"Басқаларында қолданбалар сақтаған файлдар, интернет немесе 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативті жад ретінде пайдалану"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 6d29a5c..417abc7 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/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,6 +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>
+    <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">"បណ្ដាញវ៉ាយហ្វាយ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"ប៊ូតុងចុច WPS"</string>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"បំភ្លេច"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"លេខសម្គាល់បរិក្ខារ"</string>
     <string name="baseband_version" msgid="1848990160763524801">"កំណែមូលដ្ឋាន"</string>
     <string name="kernel_version" msgid="9192574954196167602">"កំណែខឺណែល"</string>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 76bdcd6..ebc91e2 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/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ಗಮನಿಸಿ: ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ‌ಪಿನ್‌ಗಿಂತ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು."</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ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತಲೂ ಕಡಿಮೆ ಸುರಕ್ಷತೆ ಹೊಂದಿರಬಹುದು."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ರದ್ದುಮಾಡು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ಮುಂದುವರಿಸು"</string>
@@ -687,6 +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">"ಒಂದು ವೇಳೆ ವೈ-ಫೈ ಇಂಟರ್ನೆಟ್‌ ಪ್ರವೇಶವನ್ನು ಕಳೆದುಕೊಂಡರೆ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾಗೆ ಬದಲಿಸಿ."</string>
+    <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">"Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ಪುಶ್‌ ಬಟನ್‌‌"</string>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"ವೈ-ಫೈ ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"ವೈ-ಫೈ ದುರ್ಬಲ ಸಂಪರ್ಕ ಹೊಂದಿರುವಾಗ, ನೀವು ಸೆಲ್ಯುಲರ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಬಹುದು. ಡೇಟಾ ಬಳಕೆ ಅನ್ವಯವಾಗಬಹುದು."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"ಸೆಲ್ಯುಲಾರ್‌ಗೆ ಬದಲಿಸಿ"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"ಮರೆತುಬಿಡು"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-ko/strings.xml b/res/values-ko/strings.xml
index 2c81850..e8605a3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 9989750..cdb24a6 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml

@@ -342,11 +342,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>
@@ -686,6 +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>
+    <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>
@@ -763,14 +763,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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Унутулсун"</string>
@@ -864,8 +861,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>
@@ -937,22 +933,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>
@@ -1017,8 +1005,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>
@@ -1149,10 +1136,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">"Колдонмолор аркылуу сакталган жалпыга ачык документтер, Интернеттен жүктөлүп алынган же 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ташыма эстутум катары колдонуу"</string>
@@ -2671,8 +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>
+    <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>
+    <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,6 +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>
+    <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>
@@ -3092,8 +3082,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-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a7c77d8..6e3a01d 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"ລືມ"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"ໝາຍເລກອຸປະກອນ"</string>
     <string name="baseband_version" msgid="1848990160763524801">"ເວີຊັນເບສແບນ"</string>
     <string name="kernel_version" msgid="9192574954196167602">"ເວີຊັນຂອງເຄີນເນວ"</string>
@@ -1150,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">"ສິ່ງອື່ນຮວມມີໄຟລ໌ທີ່ໃຊ້ຮ່ວມກັນທີ່ບັນທຶກໄວ້ໂດຍແອັບ, ໄຟລ໌ທີ່ດາວໂຫຼດຈາກອິນເຕີເນັດ ຫຼື 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ໃຊ້ເປັນບ່ອນຈັດເກັບຂໍ້ມູນແບບພົກພາ"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-lt/strings.xml b/res/values-lt/strings.xml
index dcf25ed..d003070 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -349,11 +349,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atrakinimas piršto atspaudu"</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">"Kontrolinio kodo naudojimas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tiesiog palieskite kontrolinio kodo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</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">"Tiesiog palieskite kontrolinio kodo jutiklį, kad įgalintumėte pirkimo veiksmus arba prisijungtumėte prie programų. Atidžiai rinkitės, kieno kontrolinius kodus pridedate. Net vienu pridėtu kontroliniu kodu galima atlikti visus šiuos veiksmus.\n\nPastaba: naudodami kontrolinį kodą šio įrenginio atrakinti negalite. Daugiau informacijos galite gauti susisiekę su organizacijos administratoriumi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tiesiog palieskite kontrolinio kodo jutiklį, kad atrakintumėte telefoną, įgaliotumėte pirkimo operacijas arba prisijungtumėte prie programų. Bet kuriuo kontroliniu kodu bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atšaukti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tęsti"</string>
@@ -705,6 +703,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Sumažinti akumuliatoriaus naudojimą, kai „Wi-Fi“ įjungta"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Apriboti „Wi-Fi“ naud. akum."</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Perjungti į mobiliojo ryšio duomenis, jei prarandama „Wi‑Fi“ prieiga prie interneto."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobiliojo ryšio duomenų tinklo surogatas"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Naudoti mobiliojo ryšio duomenų tinklą, kai „Wi‑Fi“ tinkle nėra interneto ryšio. Gali būti taikomi papildomi mokesčiai."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridėti tinklą"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"„Wi-Fi“ tinklai"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS paspaudimo mygt."</string>
@@ -782,14 +782,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIJUNGTI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Šiame tinkle nėra interneto ryšio. Likti prisijungus?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Daugiau neklausti šiame tinkle"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"„Wi‑Fi“ tinkle nėra interneto ryšio"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Galite perjungti į mobiliojo ryšio tinklą, kai „Wi-Fi“ ryšys silpnas. Gali būti naudojami duomenys."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Perjungti į mobiliojo ryšio tinklą"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Toliau naudoti „Wi‑Fi“"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Daugiau niekada neberodyti"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
@@ -883,8 +880,7 @@
     <string name="home_settings" msgid="212375129455718176">"Pagrindinis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Skambučio garsumas"</string>
@@ -956,22 +952,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Nuo saulėlydžio iki saulėtekio"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Pradžios laikas"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Pabaigos laikas"</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">"Išjungtas. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Niekada nebus įjungtas automatiškai."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Bus įjungtas automatiškai <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Bus įjungtas automatiškai per saulėlydį."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Įjungtas. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Niekada nebus išjungtas automatiškai."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Bus išjungtas automatiškai <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Bus išjungtas automatiškai per saulėtekį."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -1038,8 +1026,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"„Android“ versija"</string>
     <string name="security_patch" msgid="8438384045870296634">"„Android“ saugos pataisos lygis"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelis"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Įrangos ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Nemoduliuojamo perdavimo versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"„Kernel“ versija"</string>
@@ -1170,10 +1157,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Kiti"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Naršyti <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">"Kiti failai yra bendrinami programų išsaugoti failai, iš interneto arba „Bluetooth“ atsisiųsti failai, „Android“ failai ir pan. \n\nKad galėtumėte peržiūrėti matomą „<xliff:g id="NAME">^1</xliff:g>“ turinį, palieskite „Naršyti“."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistemoje saugomi failai, kurių „Android“ negali rodyti atskirai."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> galėjo išsaugoti nuotraukų, muzikos, filmų, programų ir kitų duomenų, kurie užima <xliff:g id="SIZE">^2</xliff:g> saugyklos vietos. \n\nKad galėtumėte peržiūrėti išsamią informaciją, perjunkite į <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nustatykite <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Naudoti kaip perkeliamą atmintį"</string>
@@ -2716,8 +2701,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanalai"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Niekada nerodyti iš šios programos gautų pranešimų"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Blokuoti viską"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Niekada nerodyti iš šio kanalo gautų pranešimų"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nepaisyti netrukdymo režimo"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Leisti ir toliau teikti šiuos pranešimus, kai netrukdymo režimas nustatytas į „Tik prioritetiniai“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Užrakinimo ekrane"</string>
@@ -2726,6 +2714,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikatus"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Atlikta"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Svarba"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Visada pulsuojanti įspėjimo šviesa"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Visada vibruoti"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Taisyklės pavadinimas"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Įveskite taisyklės pavadinimą"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Taisyklės pavadinimas jau naudojamas"</string>
@@ -3155,8 +3145,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Tinklo apribojimai"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operatoriaus duomenų apskaita gali skirtis nuo įrenginio duomenų apskaitos"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Išnaudota <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">"Nustatyti duomenų įspėjimą"</string>
     <string name="data_warning" msgid="209133958008062117">"Duomenų įspėjimas"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nustatyti duomenų apribojimą"</string>
     <string name="data_limit" msgid="1885406964934590552">"Duomenų apribojimas"</string>

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

@@ -346,11 +346,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atbloķēšana ar pirksta nospiedumu"</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">"Pirksta nospieduma lietošana"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai 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">"Pieskarieties pirksta nospieduma sensoram, lai autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\n\nPiezīme. Pirksta nospiedumu nevar izmantot šīs ierīces atbloķēšanai. Lai iegūtu plašāku informāciju, sazinieties ar savas organizācijas administratoru."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atcelt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Turpināt"</string>
@@ -696,6 +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>
+    <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>
@@ -773,14 +773,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"IZVEIDOT SAVIENOJUMU"</string>
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi nav savienots ar internetu"</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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
@@ -874,8 +871,7 @@
     <string name="home_settings" msgid="212375129455718176">"Sākums"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Skaļumi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Mūzikas efekti"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Zvana skaļums"</string>
@@ -947,22 +943,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"No saulrieta līdz saullēktam"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Sākuma laiks"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Beigu laiks"</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">"Izslēgts. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nekad netiks automātiski ieslēgts."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Tiks automātiski ieslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Tiks automātiski ieslēgts saulrietā."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Ieslēgts. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nekad netiks automātiski izslēgts."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Tiks automātiski izslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Tiks automātiski izslēgts saullēktā."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -1028,8 +1016,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versija"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android drošības ielāpa līmenis"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelis"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Iekārtas ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Pamatjoslas versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel versija"</string>
@@ -1160,10 +1147,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Citi"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistēma"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Pārlūkot: <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">"Citi faili ietver koplietotus failus, kurus saglabājušas lietotnes, failus, kuri lejupielādēti no interneta vai izmantojot Bluetooth savienojumu, Android failus utt.\n\nLai skatītu šīs krātuves (<xliff:g id="NAME">^1</xliff:g>) redzamo saturu, pieskarieties vienumam Izpētīt."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistēmas faili ietver failus, ko Android nevar attēlot atsevišķi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Lietotājs <xliff:g id="USER_0">^1</xliff:g>, iespējams, ir saglabājis fotoattēlus, mūziku, filmas, lietotnes vai citus datus, kas aizņem <xliff:g id="SIZE">^2</xliff:g> lielu vietu atmiņā. \n\nLai skatītu detalizētu informāciju, pārslēdzieties uz lietotāju <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Iestatiet <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Izmantot kā pārnēsājamu krātuvi"</string>
@@ -2694,8 +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>
+    <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>
+    <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>
@@ -2704,6 +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>
+    <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>
@@ -3123,8 +3113,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Tīkla ierobežojumi"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Ieslēgt brīdinājumu par datiem"</string>
     <string name="data_warning" msgid="209133958008062117">"Datu brīdinājums"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Iestatīt datu ierobežojumu"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datu ierobežojums"</string>

diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 7d33e26..ccfa8fb 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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">"Под друго се подразбира споделени датотеки што ги зачувале апликациите, датотеки преземени од интернет или 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи како пренослива меморија"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index b8f3a3b..3d5a424 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/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ശ്രദ്ധിക്കുക: നിങ്ങളുടെ വിരലടയാളത്തിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ പിന്നിനേക്കാളോ കുറവായിരിക്കാം."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"റദ്ദാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"തുടരൂ"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"ഇന്റർനെറ്റിലേക്ക് വൈഫൈ കണക്റ്റുചെയ്‌തിട്ടില്ല"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"വൈഫൈ കണക്ഷൻ മോശമാകുമ്പോഴെല്ലാം നിങ്ങൾക്ക് സെല്ലുലാർ നെറ്റ്‌വർക്കിലേക്ക് മാറാവുന്നതാണ്. ഡാറ്റ ഉപയോഗ നിരക്ക് ബാധകമായേക്കാം."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"സെല്ലുലാറിലേക്ക് മാറുക"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"മറക്കുക"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"ഉപകരണ ഐഡി"</string>
     <string name="baseband_version" msgid="1848990160763524801">"ബെയിസ്ബാൻഡ് പതിപ്പ്"</string>
     <string name="kernel_version" msgid="9192574954196167602">"പ്രധാന പതിപ്പ്"</string>
@@ -1150,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">"മറ്റുള്ളവയിൽ, ആപ്‌സ് വഴി സംരക്ഷിച്ച പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ 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="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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"പോർട്ടബിൾ സംഭരണമായി ഉപയോഗിക്കുക"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index eac5b60..e93216b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/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Санамж: Таны хурууны хээ нь хэцүү зурган түгжээ, эсвэл ПИН-с хамгаалалт муутай байдаг."</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Санамж: Таны хурууны хээ нь хэцүү зурган түгжээ, эсвэл ПИН-с хамгаалалт муутай байдаг."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Цуцлах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Үргэлжлүүлэх"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Мартах"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Андройд хувилбар"</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>
@@ -1150,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">"Бусад файлд апп-н хадгалсан хуваалцсан файл болон Интернэт, Bluetooth, Android-с татсан файл багтдаг. \n\n<xliff:g id="NAME">^1</xliff:g>-н харагдах агуулгыг харахын тулд Судлах сонголтыг дарна уу."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Андройдын тус тусад нь харуулах боломжгүй файлыг системд агуулдаг"</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>
@@ -2670,8 +2655,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>
+    <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>
+    <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,6 +2668,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>
+    <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>
@@ -3091,8 +3081,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-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index d3dc364..df61473 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/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 टीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</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टीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"सुरु ठेवा"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"वाय-फाय इंटरनेटशी कनेक्ट केलेले नाही"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"वाय-फाय कनेक्शन खराब असताना आपण मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर लागू होऊ शकतो."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"मोबाइलवर स्विच करा"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"विसरा"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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="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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल संचयन म्हणून वापरा"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3201cba..33a953f 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/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">"Buka kunci dengan cap jari"</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">"Gunakan cap jari anda"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau mengelog masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbading corak atau PIN yang kukuh."</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">"Hanya sentuh penderia cap jari untuk membenarkan pembelian atau log masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan akan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Anda tidak boleh menggunakan cap jari untuk membuka kunci peranti ini. Untuk mengetahui maklumat lanjut, hubungi pentadbir organisasi anda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau mengelog masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbading corak atau PIN yang kukuh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Teruskan"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimumkan penggunaan bateri apabila Wi-Fi dihidupkan"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Had bateri yg digunakan Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Beralih ke data selular jika Wi-Fi kehilangan akses Internet."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Alternatif data selular"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Gunakan data selular apabila Wi-Fi kehilangan akses Internet. Caj tambahan boleh dikenakan."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambah rangkaian"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Rangkaian Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Butang Tekan WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"SAMBUNG"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Rangkaian ini tiada akses Internet. Kekal bersambung?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Jangan minta rangkaian ini lagi"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi tidak disambungkan ke Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Anda boleh beralih kepada rangkaian selular apabila sambungan Wi-Fi tidak lancar. Caj penggunaan data mungkin dikenakan."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Beralih ke selular"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Gunakan Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Jangan sekali-kali tunjukkannya lagi"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Kelantangan"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Kesan muzik"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Kelantangan deringan"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Matahari trbenam hingga terbit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Masa mula"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Masa tamat"</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">"Mati. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Tidak akan dihidupkan secara automatik."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Akan dihidupkan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Akan dihidupkan secara automatik pada waktu matahari terbenam."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Hidup. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Tidak akan dimatikan secara automatik."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Akan dimatikan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Akan dimatikan secara automatik pada waktu matahari terbit."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Tahap tampung keselamatan Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID Peralatan"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versi jalur asas"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi inti"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Lain-lain"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Teroka <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">"Fail lain termasuk fail kongsi yang disimpan oleh apl, fail yang dimuat turun dari Internet atau Bluetooth, fail Android dan sebagainya. \n\nUntuk melihat kandungan <xliff:g id="NAME">^1</xliff:g> yang kelihatan, ketik Jelajah."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem termasuk fail yang tidak dapat dipaparkan oleh Android secara individu."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, muzik, filem, apl atau data lain yang menggunakan ruang storan sebesar <xliff:g id="SIZE">^2</xliff:g>. \n\nUntuk melihat butirannya, beralih kepada <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sediakan <xliff:g id="NAME">^1</xliff:g> anda"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai storan mudah bawa"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tiada sebarang apl yang terpasang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Saluran"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan sekali-kali paparkan pemberitahuan dari apl ini"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Sekat semua"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Jangan paparkan pemberitahuan daripada saluran ini"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Atasi Jangan Ganggu"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Benarkan pemberitahuan ini terus mengganggu apabila tetapan Jangan Ganggu ditetapkan kepada Keutamaan Sahaja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pada skrin kunci"</string>
@@ -2682,6 +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">"Kepentingan"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Lampu pemberitahuan sentiasa berdenyut"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Sentiasa bergetar"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nama peraturan"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Masukkan nama peraturan"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nama peraturan sudah digunakan"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Sekatan rangkaian"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Cara pengiraan data pembawa mungkin berbeza daripada pengiraan peranti"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Tetapkan amaran data"</string>
     <string name="data_warning" msgid="209133958008062117">"Amaran data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Tetapkan had data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Had data"</string>

diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 51fbacc..75a7241 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/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မှတ်ချက် − သင့်လက်ဗွေသည် ခိုင်မာသည့် ပုံစံ သို့မဟုတ် ပင်နံပါတ် တစ်ခုထက် လုံခြုံမှု ပိုအားနည်းနိုင်ပါသည်။"</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မှတ်ချက် − သင့်လက်ဗွေသည် ခိုင်မာသည့် ပုံစံ သို့မဟုတ် ပင်နံပါတ် တစ်ခုထက် လုံခြုံမှု ပိုအားနည်းနိုင်ပါသည်။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"မလုပ်တော့"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ဆက်လုပ်ရန်"</string>
@@ -687,6 +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>
+    <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">"ဝိုင်ဖိုင်ကွန်ရက်များ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS နှိပ်ရန်ခလုတ်"</string>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"မေ့ပစ်ရန်"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"စက်ပစ္စည်း အမှတ်"</string>
     <string name="baseband_version" msgid="1848990160763524801">"baseband ဗားရှင်း"</string>
     <string name="kernel_version" msgid="9192574954196167602">"kernelဗားရှင်း"</string>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-nb/strings.xml b/res/values-nb/strings.xml
index b69249b..6895e49 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/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">"Lås opp med fingeravtrykk"</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">"Bruk fingeravtrykket ditt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Du trenger bare å trykke på fingeravtrykkssensoren for å låse opp telefonen, autorisere kjøp eller logge på apper. Tenk godt over hvilke fingeravtrykk du legger til – alle som får tilgang, kan nemlig utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode."</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">"Bare trykk på fingeravtrykkssensoren for å autorisere kjøp eller logge på apper. Tenk over hvilke fingeravtrykk du legger til. Alle avtrykkene du legger til, kan gjøre alt dette.\n\nMerk: Du kan ikke bruke fingeravtrykket ditt til å låse opp denne enheten. For mer informasjon, kontakt administratoren for organisasjonen din."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Du trenger bare å trykke på fingeravtrykkssensoren for å låse opp telefonen, autorisere kjøp eller logge på apper. Tenk godt over hvilke fingeravtrykk du legger til – alle fingeravtrykk som legges til, kan utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsett"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOBLE TIL"</string>
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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 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>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Startside"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikkeffekter"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Ringevolum"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Solnedgang til soloppgang"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Starttid"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttid"</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">"Av. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Blir aldri slått på automatisk."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Blir slått på automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Blir slått på automatisk ved solnedgang."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"På. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Blir aldri slått av automatisk."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Blir slått av automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Blir slått av automatisk ved soloppgang."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versjon"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivå for patch (feilretting) av sikkerhet på Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modell"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Utstyrs-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basisbåndversjon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Annet"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforsk <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">"Annet omfatter delte filer lagret av apper, filer lastet ned fra Internett eller Bluetooth, Android-filer og så videre. \n\nFor å se det synlige innholdet på <xliff:g id="NAME">^1</xliff:g>, trykk på Utforsk."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"System omfatter filer Android ikke kan vise individuelt."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan ha lagret bilder, musikk, filmer, apper eller andre data som tar opp <xliff:g id="SIZE">^2</xliff:g> av lagringsplassen. \n\nHvis du vil se detaljer, bytt til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Bruk som bærbar lagring"</string>
@@ -2141,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) -->
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Nettverksbegrensninger"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Angi datavarsel"</string>
     <string name="data_warning" msgid="209133958008062117">"Advarsel for dataforbruk"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angi en datagrense"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrense"</string>

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index c0050e8..a192eb6 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/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,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi चालेको बेला ब्याट्रिको प्रयोग कम गर्नुहोस्"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"वाइफाइले सीमित ब्याट्री प्रयोग"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Wi-Fi इन्टरनेट अनुपलब्ध भए सेलुलर डेटामा स्विच गर्नुहोस्।"</string>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONNECT"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"यो नेटवर्क इन्टरनेटमा पहुँच छैन। सम्पर्क कायम राख्न चाहनुहुन्छ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"यस नेटवर्कको लागि फेरि नसोध्नुहोस्"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"बिर्सनुहोस्"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"एन्ड्रोइड संस्करण"</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>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-nl/strings.xml b/res/values-nl/strings.xml
index 4f53ee9..093d82f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/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">"Ontgrendelen met vingerafdruk"</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">"Je vingerafdruk gebruiken"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</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">"Raak de vingerafdruksensor aan om aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je apparaat, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je kunt je vingerafdruk niet gebruiken om dit apparaat te ontgrendelen. Neem contact op met de beheerder van je organisatie voor meer informatie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuleren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Doorgaan"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Accugebruik minimaliseren wanneer wifi is ingeschakeld"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Accugebruik van wifi beperken"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Overschakelen naar mobiele gegevens als wifi geen internettoegang meer heeft."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Mobiele data als reserveoptie"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Mobiele data gebruiken wanneer er geen internettoegang via wifi is. Er kunnen extra kosten in rekening worden gebracht."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netwerk toevoegen"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wifi-netwerken"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-knop"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KOPPELEN"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Dit netwerk heeft geen internettoegang. Verbonden blijven?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Niet meer vragen voor dit netwerk"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wifi heeft geen verbinding met internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Je kunt overschakelen naar het mobiele netwerk wanneer er geen goede wifi-verbinding is. Er kunnen kosten voor datagebruik in rekening worden gebracht."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Overschakelen naar mobiel netwerk"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wifi blijven gebruiken"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nooit meer laten zien"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Startpagina"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muziekeffecten"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Beltoonvolume"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Zonsondergang tot zonsopgang"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Begintijd"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Eindtijd"</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">"Uit. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Wordt nooit automatisch ingeschakeld."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Wordt automatisch ingeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Wordt automatisch ingeschakeld bij zonsondergang."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Aan. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Wordt nooit automatisch uitgeschakeld."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Wordt automatisch uitgeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Wordt automatisch uitgeschakeld bij zonsopgang."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versie"</string>
     <string name="security_patch" msgid="8438384045870296634">"Niveau van Android-beveiligingspatch"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Apparatuur-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Smalbandversie"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versie"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Overige"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Systeem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> verkennen"</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">"Overig omvat gedeelde bestanden die zijn opgeslagen door apps, bestanden die zijn gedownload van internet of via Bluetooth, Android-bestanden, enzovoort. \n\nAls je de zichtbare content van deze <xliff:g id="NAME">^1</xliff:g> wilt bekijken, tik je op Verkennen."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Systeem omvat bestanden die Android niet afzonderlijk kan weergeven."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan opgeslagen foto\'s, muziek, films, apps of andere gegevens bevatten die <xliff:g id="SIZE">^2</xliff:g> aan opslagruimte innemen. \n\nAls je details wilt bekijken, schakel je over naar <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Je <xliff:g id="NAME">^1</xliff:g> configureren"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruiken als draagbare opslag"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot \'Niet storen\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Er zijn geen geïnstalleerde apps die toegang tot \'Niet storen\' hebben aangevraagd"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanalen"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nooit meldingen van deze app weergeven"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Alles blokkeren"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nooit meldingen van dit kanaal weergeven"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'Niet storen\' overschrijven"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Deze meldingen nog steeds laten onderbreken wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op het vergrendelingsscherm"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Gevoelig"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gereed"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Belang"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Altijd meldingslampje laten knipperen"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Altijd trillen"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Regelnaam"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Naam van regel invoeren"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Regelnaam is al in gebruik"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Netwerkbeperkingen"</string>
     <string name="operator_warning" msgid="1862988028996859195">"De door de provider berekende gegevens kunnen afwijken van de berekening van het apparaat"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Datawaarschuwing instellen"</string>
     <string name="data_warning" msgid="209133958008062117">"Datawaarschuwing"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Datalimiet instellen"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>

diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index f6ba3e8..04d29dc 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"ਭੁੱਲਣਾ"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"Kernel ਵਰਜਨ"</string>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-pl/strings.xml b/res/values-pl/strings.xml
index f1bd16d..c76253c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -349,11 +349,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odblokuj odciskiem palca"</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">"Korzystanie z odcisku palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: odcisk palca może być mniej bezpieczny niż trudny wzór czy kod 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">"Autoryzuj zakupy i loguj się do aplikacji, dotykając czujnika linii papilarnych. Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: nie możesz odblokowywać tego urządzenia odciskiem palca. Więcej informacji uzyskasz u administratora swojej organizacji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Ostrożnie dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: odcisk palca może być mniej bezpieczny niż trudny wzór czy kod PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anuluj"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Dalej"</string>
@@ -705,6 +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>
+    <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>
@@ -782,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
@@ -883,8 +880,7 @@
     <string name="home_settings" msgid="212375129455718176">"Ekran główny"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efekty muzyczne"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Głośność dzwonka"</string>
@@ -956,22 +952,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od zachodu do wschodu słońca"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Czas rozpoczęcia"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Czas zakończenia"</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">"Wyłączony <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nigdy nie włączy się automatycznie."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Włączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Włączy się automatycznie o zachodzie słońca."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Włączony. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nigdy nie wyłączy się automatycznie."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Wyłączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Wyłączy się automatycznie o wschodzie słońca."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -1038,8 +1026,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Wersja systemu Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Stan aktualizacji zabezpieczeń"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Identyfikator sprzętu"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Wersja pasma podstawowego"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Wersja jądra"</string>
@@ -1170,10 +1157,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Inne"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Przeglądaj <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">"Reszta to udostępniane pliki zapisywane przez aplikacje, pliki pobrane z internetu lub przez Bluetooth, pliki Androida itp. \n\nAby zobaczyć widoczną zawartość nośnika <xliff:g id="NAME">^1</xliff:g>, kliknij Przeglądaj."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"System uwzględnia pliki, których Android nie może wyświetlić pojedynczo."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Użytkownik <xliff:g id="USER_0">^1</xliff:g> może mieć zapisane zdjęcia, muzykę, filmy, aplikacje i inne dane, które zajmują <xliff:g id="SIZE">^2</xliff:g> pamięci. \n\nAby wyświetlić szczegóły, przełącz na <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Skonfiguruj: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Użyj jako pamięci przenośnej"</string>
@@ -2716,8 +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>
+    <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>
+    <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>
@@ -2726,6 +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>
+    <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>
@@ -3153,8 +3143,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Ograniczenia sieci"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Wykorzystano <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">"Ustaw próg ostrzegawczy"</string>
     <string name="data_warning" msgid="209133958008062117">"Próg ostrzegawczy"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ustaw limit transmisji danych"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limit danych"</string>

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b2d5b16..a6cdc8a 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/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">"Desbloqueio com digital"</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">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</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">"Basta tocar no sensor de impressão digital para autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Não é possível usar sua impressão digital para desbloquear este dispositivo. Para ver mais informações, entre em contato com o administrador da sua organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Sua impressão digital pode ser menos segura que um PIN ou padrão forte."</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>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar o uso da bateria quando o Wi-Fi estiver ligado"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Lim. de bat. usado pelo Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Alternar para dados de celular se o Wi-Fi perder o acesso à Internet."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Fallback por dados da rede celular"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Usar dados da rede celular quando o Wi‑Fi perde o acesso à Internet. Cobranças adicionais podem ser aplicadas."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Esta rede não tem acesso à Internet. Permanecer conectado?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Não perguntar novamente para esta rede"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi sem acesso à Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Você pode mudar para o plano de dados sempre que a conexão Wi-Fi falhar. Taxas de uso de dados podem ser aplicáveis."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Usar plano de dados"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Continuar no Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Não mostrar de novo"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume do toque"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do pôr ao nascer do sol"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Horário de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Horário de término"</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">"Desativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca será ativado automaticamente."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Será ativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Será ativado automaticamente ao pôr do sol."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Ativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca será desativado automaticamente."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Será desativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Será desativado automaticamente ao nascer do sol."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nível do patch de segurança do Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID do equipamento"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versão da banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</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>
-    <!-- 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">"Outros incluem arquivos compartilhados salvos por apps, arquivos transferidos por download a partir da Internet ou Bluetooth, arquivos Android e assim por diante. \n\nPara ver todos o conteúdo visível desse <xliff:g id="NAME">^1</xliff:g>, toque em \"Explorar\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"O sistema inclui arquivos que o Android não pode exibir individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É possível que <xliff:g id="USER_0">^1</xliff:g> tenha salvado fotos, músicas, filmes, apps ou outros dados que estão ocupando <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver os detalhes, alterne para <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar seu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como armazenamento portátil"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Canais"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações deste app"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloquear tudo"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nunca mostrar notificações desse canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importância"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Sempre pulsar a luz de notificação"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Sempre vibrar"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Digitar nome da regra"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"O nome da regra já está em uso"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <string name="operator_warning" msgid="1862988028996859195">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c0f27c9..b28dec9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/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">"Desbloq. c/ impressão digital"</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">"Utilizar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</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">"Basta tocar no sensor de impressões digitais para autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: não é possível utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</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>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar a utilização da bateria quando o Wi-Fi está ligado"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limitar bat. utiliz. por Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Mudar para dados móveis se o Wi‑Fi perder o acesso à Internet."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Alternativa de dados móveis"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Utilizar os dados móveis quando o Wi‑Fi perder o acesso à Internet. Podem aplicar-se custos adicionais."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"LIGAR"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Esta rede não tem acesso à Internet. Pretende manter a ligação?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Não perguntar novamente para esta rede"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"A rede Wi‑Fi não tem ligação à Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Pode mudar para dados móveis sempre que a ligação Wi-Fi for fraca. Podem aplicar-se despesas de utilização de dados."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Mudar para dados móveis"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Permanecer em Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Não mostrar novamente"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Página Inicial"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ecrã"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos musicais"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume do toque"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do pôr do sol ao nascer do sol"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de fim"</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">"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_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_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>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nível do patch de segurança do Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID do Equipamento"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versão de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</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>
-    <!-- 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">"Os outros ficheiros incluem ficheiros guardados por aplicações, ficheiros transferidos da Internet ou por Bluetooth, ficheiros Android files, entre outros. \n\nPara ver os conteúdos visíveis deste <xliff:g id="NAME">^1</xliff:g>, toque em Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"O sistema inclui ficheiros que o Android não consegue apresentar individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> pode ter fotos, música, filmes, aplicações ou outros dados guardados que estejam a utilizar <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver detalhes, mude para <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar o <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como armazenamento portátil"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhuma aplicação instalada solicitou acesso Não incomodar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Canais"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações desta aplicação"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloquear tudo"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nunca mostrar notificações deste canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substituir o modo Não incomodar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver definido como Apenas prioridade"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"No ecrã de bloqueio"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensível"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importância"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Utilizar sempre a luz de notificações"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Vibrar sempre"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Introduzir nome da regra"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"O nome da regra já está a ser utilizado"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <string name="operator_warning" msgid="1862988028996859195">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s)"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b2d5b16..a6cdc8a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/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">"Desbloqueio com digital"</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">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</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">"Basta tocar no sensor de impressão digital para autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Não é possível usar sua impressão digital para desbloquear este dispositivo. Para ver mais informações, entre em contato com o administrador da sua organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Sua impressão digital pode ser menos segura que um PIN ou padrão forte."</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>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar o uso da bateria quando o Wi-Fi estiver ligado"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Lim. de bat. usado pelo Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Alternar para dados de celular se o Wi-Fi perder o acesso à Internet."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Fallback por dados da rede celular"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Usar dados da rede celular quando o Wi‑Fi perde o acesso à Internet. Cobranças adicionais podem ser aplicadas."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Esta rede não tem acesso à Internet. Permanecer conectado?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Não perguntar novamente para esta rede"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi sem acesso à Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Você pode mudar para o plano de dados sempre que a conexão Wi-Fi falhar. Taxas de uso de dados podem ser aplicáveis."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Usar plano de dados"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Continuar no Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Não mostrar de novo"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume do toque"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do pôr ao nascer do sol"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Horário de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Horário de término"</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">"Desativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca será ativado automaticamente."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Será ativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Será ativado automaticamente ao pôr do sol."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Ativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca será desativado automaticamente."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Será desativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Será desativado automaticamente ao nascer do sol."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nível do patch de segurança do Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID do equipamento"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versão da banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</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>
-    <!-- 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">"Outros incluem arquivos compartilhados salvos por apps, arquivos transferidos por download a partir da Internet ou Bluetooth, arquivos Android e assim por diante. \n\nPara ver todos o conteúdo visível desse <xliff:g id="NAME">^1</xliff:g>, toque em \"Explorar\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"O sistema inclui arquivos que o Android não pode exibir individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É possível que <xliff:g id="USER_0">^1</xliff:g> tenha salvado fotos, músicas, filmes, apps ou outros dados que estão ocupando <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver os detalhes, alterne para <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar seu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como armazenamento portátil"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Canais"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações deste app"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bloquear tudo"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Nunca mostrar notificações desse canal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importância"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Sempre pulsar a luz de notificação"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Sempre vibrar"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome da regra"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Digitar nome da regra"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"O nome da regra já está em uso"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <string name="operator_warning" msgid="1862988028996859195">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="209133958008062117">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Definir limite de dados"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>

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

@@ -346,11 +346,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Deblocați cu amprenta"</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">"Folosiți amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</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">"Puteți să autorizați achiziții sau să vă conectați la aplicații atingând senzorul de amprentă. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: nu vă puteți folosi amprenta ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuați"</string>
@@ -696,6 +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>
+    <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>
@@ -773,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
@@ -874,8 +871,7 @@
     <string name="home_settings" msgid="212375129455718176">"Ecran de pornire"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efecte muzicale"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volumul soneriei"</string>
@@ -947,22 +943,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"De la apus la răsărit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Ora începerii"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ora încheierii"</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">"Dezactivat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nu se va activa niciodată automat."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se va activa automat la <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se va activa automat la apus."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nu se va dezactiva niciodată automat."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se va dezactiva automat la <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se va dezactiva automat la răsărit."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1028,8 +1016,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versiune Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivelul corecției de securitate Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID echipament"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versiunea benzii de bază"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versiune nucleu"</string>
@@ -1135,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>
@@ -1160,10 +1147,8 @@
     <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>
-    <!-- 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">"Î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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Folosiți ca stocare portabilă"</string>
@@ -2694,8 +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>
+    <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>
+    <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>
@@ -2704,6 +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>
+    <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>
@@ -3123,8 +3113,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Restricții de rețea"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Cuantificarea datelor de către operator poate fi diferită de cea de pe dispozitiv"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Date utilizate: <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">"Setați avertisment pentru date"</string>
     <string name="data_warning" msgid="209133958008062117">"Avertisment pentru date"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setați limita de date"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limită de date"</string>

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

@@ -349,11 +349,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>
@@ -705,6 +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>
+    <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>
@@ -782,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
@@ -883,8 +880,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>
@@ -956,22 +952,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>
@@ -1038,8 +1026,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">"Последнее обновление системы безопасности"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Модель"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Идентификатор оборудования"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Прошивка модуля связи"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия ядра"</string>
@@ -1170,10 +1157,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">"В разделе \"Другое\" находятся файлы с общим доступом, сохраненные приложениями, контент, скачанный из Интернета или по 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативный носитель"</string>
@@ -2716,8 +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>
+    <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>
+    <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>
@@ -2726,6 +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>
+    <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>
@@ -3153,8 +3143,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>
@@ -3250,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-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 66e5e48..3b4655b 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"අමතක කරන්න"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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,8 +2659,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>
+    <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>
+    <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>
@@ -2684,6 +2672,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>
+    <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>
@@ -3095,8 +3085,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-sk/strings.xml b/res/values-sk/strings.xml
index 0a24772..170b559 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -349,11 +349,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odomknutie odtlačkom prsta"</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">"Používanie odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Ak chcete odomknúť telefón, schváliť nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. Dobre zvážte, čie odtlačky pridáte. Tieto operácie bude totiž možné vykonávať pomocou každého pridaného odtlačku.\n\nPoznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód 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">"Ak chcete autorizovať nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. Dávajte pozor, čie odtlačky pridáte. Tieto operácie bude môcť vykonávať každý pridaný odtlačok.\n\nPoznámka: Odtlačok prsta nie je možné použiť na odomknutie tohto zariadenia. Ďalšie informácie vám poskytne správca vašej organizácie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Ak chcete odomknúť telefón, schváliť nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odltačkov prstov. Dobre zvážte, čie odtlačky pridáte. Tieto operácie bude totiž možné vykonávať pomocou každého pridaného odtlačku.\n\nPoznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Zrušiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovať"</string>
@@ -705,6 +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>
+    <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>
@@ -782,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
@@ -883,8 +880,7 @@
     <string name="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Hlasitosť zvonenia"</string>
@@ -956,22 +952,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od západu do východu slnka"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Čas začiatku"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončenia"</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">"Vypnuté. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikdy sa automaticky nezapne."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Zapne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Zapne sa automaticky pri západe slnka."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Zapnuté. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikdy sa automaticky nevypne."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Vypne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Vypne sa automaticky pri východe slnka."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1038,8 +1026,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzia systému Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Úroveň opráv zabezpečenia systému"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID zariadenia"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Verzia základného pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzia jadra"</string>
@@ -1170,10 +1157,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Iné"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Preskúmať položku <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">"Priečinok Iné obsahuje zdieľané súbory uložené aplikáciami, súbory stiahnuté z internetu alebo prostredníctvom rozhrania Bluetooth, súbory Androidu atď. \n\nAk chcete zobraziť viditeľný obsah tohto zariadenia typu <xliff:g id="NAME">^1</xliff:g>, klepnite na položku Preskúmať."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Systém obsahuje súbory, ktoré Android nedokáže zobraziť samostatne."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Používateľ <xliff:g id="USER_0">^1</xliff:g> má pravdepodobne uložené fotky, hudbu, filmy, aplikácie alebo iné údaje, ktoré v úložisku zaberajú <xliff:g id="SIZE">^2</xliff:g>. \n\nAk si chcete zobraziť podrobné informácie, prepnite na používateľa <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložisko <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použiť ako prenosné úložisko"</string>
@@ -2716,8 +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>
+    <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>
+    <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>
@@ -2726,6 +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>
+    <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>
@@ -3153,8 +3143,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Obmedzenia siete"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Použité: <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">"Nastaviť upozornenie na dáta"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozornenie na dáta"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastaviť dátový limit"</string>
     <string name="data_limit" msgid="1885406964934590552">"Dátový limit"</string>

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

@@ -349,11 +349,9 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odklepanje s prstnim odtisom"</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">"Uporaba prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Dotaknite se tipala prstnih odtisov, če želite odkleniti telefon, odobriti nakupe ali se prijaviti v aplikacije. Pazite, čigave prstne odtise boste dodali. Ta dejanja bo mogoče izvesti že z enim dodanim prstnim odtisom.\n\nOpomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda 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">"Odobrite nakupe ali se prijavite v aplikacije samo z dotikom tipala prstnih odtisov. Pazite, čigave prstne odtise boste dodali, saj ta dejanja lahko izvaja že en sam dodan prstni odtis.\n\nOpomba: prstnega odtisa ne morete uporabiti za odklepanje naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Dotaknite se tipala prstnih odtisov, če želite odkleniti telefon, odobriti nakupe ali se prijaviti v aplikacije. Ta dejanja bo mogoče izvesti že z enim dodanim prstnim odtisom, zato pazite, čigave prstne odtise boste dodali.\n\nOpomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Prekliči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Naprej"</string>
@@ -705,6 +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>
+    <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>
@@ -782,14 +782,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
@@ -883,8 +880,7 @@
     <string name="home_settings" msgid="212375129455718176">"Začetna stran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Glasbeni učinki"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Glasnost zvonjenja"</string>
@@ -956,22 +952,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od sončnega zahoda do vzhoda"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Začetni čas"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Končni čas"</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">"Izklopljeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Brez samodejnega vklopa."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Samodejni vklop ob <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Samodejni vklop ob sončnem zahodu."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Vklopljeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Brez samodejnega izklopa."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Samodejni izklop ob <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Samodejni izklop ob sončnem vzhodu."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po toliko nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1038,8 +1026,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Različica sistema Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Raven popravkov za varnost v Androidu"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID opreme"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Različica radijske programske opreme"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Različica jedra"</string>
@@ -1170,10 +1157,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Drugo"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Razišči: <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">"Med druge datoteke spadajo datoteke v skupni rabi, ki jih shranijo aplikacije, datoteke, ki jih prenesete iz interneta ali prek Bluetootha, datoteke sistema Android in druge. \n\nČe si želite ogledati vidno vsebino te naprave za shranjevanje <xliff:g id="NAME">^1</xliff:g>, se dotaknite »Razišči«."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem vključuje datoteke, ki jih Android ne more prikazati posamezno."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Uporabnik <xliff:g id="USER_0">^1</xliff:g> je morda shranil fotografije, glasbo, filme, aplikacije ali druge podatke, ki zasedajo <xliff:g id="SIZE">^2</xliff:g> shrambe. \n\nČe si želite ogledati podrobnosti, preklopite na uporabnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavitev imena za: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Uporaba kot prenosna shramba"</string>
@@ -2716,8 +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>
+    <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>
+    <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>
@@ -2726,6 +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>
+    <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>
@@ -3153,8 +3143,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Omejitve omrežja"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operaterjeve meritve prenosa podatkov so morda drugačne kot v napravi"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Uporabljeno: <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">"Nastavi opozorilo o uporabi podatkov"</string>
     <string name="data_warning" msgid="209133958008062117">"Opozorilo za prenos podatkov"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastavitev omej. prenosa pod."</string>
     <string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>

diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 2e14878..48fcf65 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/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">"Shkyçe me gjurmën e gishtit"</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">"Përdor gjurmën e gishtit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Thjesht prek te sensori i gjurmës së gishtit për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra. \n\nShënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë."</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">"Thjesht prek te sensori i gjurmës së gishtit për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra.\n\nShënim: Nuk mund ta përdorësh gjurmën tënde të gishtit për të shkyçur këtë pajisje. Për më shumë informacione, kontakto me administratorin e organizatës tënde."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Thjesht prek te sensori i gjurmës së gishtit për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra.\n\nShënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Vazhdo"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizo përdorimin e baterisë kur Wi‑Fi është aktiv"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Kufizo baterinë në Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Kalo te të dhënat celulare nëse Wi‑Fi humbet qasjen në internet."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Alternativa për të dhënat celulare"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Përdor të dhënat celulare kur Wi‑Fi humbet qasjen në internet. Mund të zbatohen tarifa shtesë."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Shto një rrjet"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Rrjetet Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Butoni me shtypje WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"LIDHE"</string>
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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 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">"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>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Ekrani kryesor"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paraqitja"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tingulli"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumet"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efektet e muzikës"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volumi i ziles"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Nga perëndimi në agim"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Koha e nisjes"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Koha e përfundimit"</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">"Joaktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nuk do të aktivizohet asnjëherë automatikisht."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Do të aktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Do të aktivizohet automatikisht kur të perëndojë dielli."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nuk do të çaktivizohet asnjëherë automatikisht."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Do të çaktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Do të çaktivizohet automatikisht në agim."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Në gjendje gjumi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrani çaktivizohet"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kur, <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versioni i Android-it"</string>
     <string name="security_patch" msgid="8438384045870296634">"Niveli i korrigjimit të sigurisë së Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modeli"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID-ja e pajsjes"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versioni i brezit të bazës"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versioni i bërthamës"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Tjetër"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistemi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Eksploro <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">"Përfshin po ashtu skedarët e ndarë që janë ruajtur nga aplikacionet, skedarët e shkarkuar nga interneti ose me Bluetooth, skedarët e Android e të tjera. \n\nPër të parë të gjitha përmbajtjet e dukshme në këtë <xliff:g id="NAME">^1</xliff:g>, trokit tek \"Eksploro\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistemi përfshin skedarët që Android nuk mund t\'i shfaqë individualisht."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mund të ketë ruajtur fotografi, muzikë, filma, aplikacione ose të dhëna të tjera që po zënë <xliff:g id="SIZE">^2</xliff:g> nga hapësira ruajtëse. \n\npër të parë detajet, kalo te <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Përdore si hapësirë portative ruajtjeje"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Qasja te \"Mos shqetëso\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kanalet"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bllokoji të gjitha"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Mos shfaq asnjëherë njoftime nga ky aplikacion"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Bllokoji të gjitha"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Mos shfaq asnjëherë njoftime nga ky kanal"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anulo \"Mos shqetëso\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lejo që këto njoftime të vazhdojnë të ndërpresin kur \"Mos shqetëso\" është vendosur në \"Vetëm prioritare\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Në ekranin e kyçjes"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikate"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"U krye!"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Rëndësia"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Drita e njoftimeve gjithmonë me pulsim"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Gjithmonë me dridhje"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Emri i rregullit"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Fut emrin e rregullit"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Emri i rregullit është tashmë në përdorim"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Kufizimet e rrjetit"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga llogaritja e pajisjes"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Cakto paralajm. për të dhënat"</string>
     <string name="data_warning" msgid="209133958008062117">"Paralajmërimi i të dhënave"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Cakto kufirin e të dhënave"</string>
     <string name="data_limit" msgid="1885406964934590552">"Kufiri i të dhënave"</string>

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

@@ -346,11 +346,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>
@@ -696,6 +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>
+    <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>
@@ -773,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -874,8 +871,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>
@@ -947,22 +943,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>
@@ -1028,8 +1016,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">"ИД опреме"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Верзија основног пропусног опсега"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Верзија језгра"</string>
@@ -1160,10 +1147,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">"Остало обухвата дељене датотеке које су сачувале апликације, датотеке преузете са Интернета или 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи као преносиву меморију"</string>
@@ -2052,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>
@@ -2694,8 +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>
+    <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>
+    <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>
@@ -2704,6 +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>
+    <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>
@@ -3123,8 +3113,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-sv/strings.xml b/res/values-sv/strings.xml
index 45a13f4..df6ccf9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/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">"Lås upp med fingeravtryck"</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">"Använda ditt fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tryck bara på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till någons fingeravtryck, eftersom alla som du lägger till kan utföra alla dessa åtgärder.\n\nObs! Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</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">"Tryck på fingeravtryckssensorn för att godkänna köp eller logga in i appar. Var försiktig med vems fingeravtryck du lägger till eftersom även den personen kan göra detta.\n\nObs! Det går inte att låsa upp den här enheten med ett fingeravtryck. Kontakta administratören för din organisation om du vill veta mer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tryck bara på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till någons fingeravtryck, eftersom alla som du lägger till kan utföra alla dessa åtgärder.\n\nObs! Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsätt"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Startskärm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volymer"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Ringvolym"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Soluppgång till solnedgång"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Starttid"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttid"</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">"Av. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Aktiveras aldrig automatiskt."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Aktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Aktiveras automatiskt när solen går ned."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"På. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Inaktiveras aldrig automatiskt."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Inaktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Inaktiveras automatiskt när solen går upp."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
     <string name="security_patch" msgid="8438384045870296634">"Nivå av säkerhetskorrigering för Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modell"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Utrustnings-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basbandsversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-version"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Övrigt"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforska <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">"Övriga filer omfattar exempelvis delade filer som har sparats via appar, filer som har laddats ned från internet eller via Bluetooth och Android-filer. \n\nTryck på Utforska om du vill visa <xliff:g id="NAME">^1</xliff:g> synliga innehåll."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"I systemet finns filer som Android-enheter inte kan visa en och en."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan ha sparade foton, musik, filmer, appar eller annan data som tar upp <xliff:g id="SIZE">^2</xliff:g> av lagringsutrymmet. \n\nByt till <xliff:g id="USER_1">^1</xliff:g> för mer information."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurera ditt <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Använd som bärbar lagringsenhet"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Nätverksbegränsningar"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operatörens dataredovisning kan skilja sig från enhetens dataredovisning."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> har använts"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Konfigurera en datavarning"</string>
     <string name="data_warning" msgid="209133958008062117">"Datavarning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ange datagräns"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagräns"</string>

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

@@ -345,11 +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>
-    <!-- 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">"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>
-    <!-- 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">"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>
@@ -691,6 +689,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Punguza matumizi ya betri wakati Wi-Fi imewashwa"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Dhibiti betri inayotumiwa na Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Badili utumie data ya simu Wi-Fi ikipoteza ufikiaji kwa Intaneti."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Kutumia data ya simu za mkononi"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Tumia data ya simu za mkononi Wi-Fi ikipoteza muunganisho wa Intaneti. Huenda ukatozwa ada ya ziada ya kutumia data."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Mitandao ya Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Kitufe cha kusukuma cha WSP"</string>
@@ -768,14 +768,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"UNGANISHA"</string>
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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 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>
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
@@ -869,8 +866,7 @@
     <string name="home_settings" msgid="212375129455718176">"Mwanzo"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Athari za muziki"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Kiwango cha sauti ya mlio"</string>
@@ -942,22 +938,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Mapambazuko hadi machweo"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Litawashwa"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Litazimwa"</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">"Imezimwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Haitawahi kuwashwa kiotomatiki."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Itawashwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Itawashwa kiotomatiki jua litakapotua."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Imewashwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Haitawahi kuzimwa kiotomatiki."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Itazimwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Itazima kiotomatiki kutakapopambazuka."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -1022,8 +1010,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Toleo la Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Kiwango cha kuzuia athari za usalama kwenye Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Muundo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Kitambulisho cha Kifaa"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Toleo la Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Toleo la kiini"</string>
@@ -1154,10 +1141,8 @@
     <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>
-    <!-- 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">"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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Tumia kama hifadhi inayohamishika"</string>
@@ -2678,8 +2663,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ufikiaji wa Usinisumbue"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hakuna programu zilizosakinishwa ambazo zimeomba ufikiaji wa Usinisumbue"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Vituo"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Usionyeshe arifa zozote kutoka programu hii"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Zuia zote"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Usionyeshe arifa zozote kutoka kituo hiki"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batilisha hali ya \'Usinisumbue\'"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kukatiza wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Skrini inapofungwa"</string>
@@ -2688,6 +2676,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nyeti"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Nimemaliza"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Umuhimu"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Tumia mwangaza wa arifa za simu kila mara"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Tetema kila mara"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Jina la sheria"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ingiza jina la sheria"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Jina la sheria linatumika tayari"</string>
@@ -3099,8 +3089,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Vizuizi vya mtandao"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Huenda hesabu ya data ya mtoa huduma ikawa tofauti na ya kifaa chako."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> zimetumika"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Weka onyo la matumizi ya data"</string>
     <string name="data_warning" msgid="209133958008062117">"Onyo kuhusu data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Weka kikomo cha data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Kikomo cha data"</string>

diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 66445a2..5c22759 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/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குறிப்பு: வலிமையான பேட்டர்ன் அல்லது பின்னை விட, கைரேகையானது பாதுகாப்பு குறைவானதாக இருக்கக்கூடும்."</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குறிப்பு: வலிமையான பேட்டர்ன் அல்லது பின்னை விட, கைரேகையானது பாதுகாப்பு குறைவானதாக இருக்கக்கூடும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ரத்துசெய்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"தொடரவும்"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"வைஃபையில் இணைய இணைப்பு இல்லை"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"வைஃபை இணைப்பு மோசமாக இருக்கும் போது, செல்லுலார் நெட்வொர்க்குக்கு மாற்றிக்கொள்ளலாம். தரவு பயன்படுத்தப்படலாம்."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"செல்லுலாருக்கு மாறு"</string>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"மறந்துவிடு"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"உபகரணத்தின் ஐடி"</string>
     <string name="baseband_version" msgid="1848990160763524801">"பேஸ்பேண்ட் பதிப்பு"</string>
     <string name="kernel_version" msgid="9192574954196167602">"கர்னல் பதிப்பு"</string>
@@ -1150,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="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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"கையடக்க சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index b7a16f4..11999d4 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"విస్మరించు"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-th/strings.xml b/res/values-th/strings.xml
index 8a9801d..71fe8bb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"รหัสอุปกรณ์"</string>
     <string name="baseband_version" msgid="1848990160763524801">"เวอร์ชันเบสแบนด์"</string>
     <string name="kernel_version" msgid="9192574954196167602">"เวอร์ชันเคอร์เนล"</string>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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-tl/strings.xml b/res/values-tl/strings.xml
index 0c9c917..0587e5d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/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">"I-unlock ng fingerprint"</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">"Gamitin ang iyong fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Pindutin lang ang sensor ng fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili, o mag-sign in sa mga app. Huwag basta-basta magdagdag ng mga fingerprint ng ibang tao. Kahit isang fingerprint lang ang idagdag, magagawa ang alinman sa mga bagay na ito.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o 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">"Pindutin lang ang sensor para sa fingerprint upang pahintulutan ang mga pagbili, o mag-sign in sa mga app. Mag-ingat sa pagdaragdag ng mga fingerprint. Magagawa ng idaragdag na fingerprint ng sinuman ang alinman sa mga bagay na ito.\n\nTandaan: Hindi mo magagamit ang iyong fingerprint upang ma-unlock ang device na ito. Para sa higit pang impormasyon, makipag-ugnayan sa admin ng iyong organisasyon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Pindutin lang ang sensor para sa fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili, o mag-sign in sa mga app. Huwag basta-basta magdagdag ng mga fingerprint ng ibang tao. Magagawa ng alinmang idinagdag na mga fingerprint ang mga bagay na ito.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselahin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Magpatuloy"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Bawasan ang paggamit ng baterya kapag naka-on ang Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit bateryang gamit ng Wi-Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Lumipat sa cellular data kung nawalan ng access sa Internet ang Wi‑Fi."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Cellular data fallback"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Gumamit ng cellular data kapag nawalan ng access sa Internet ang Wi‑Fi. Maaaring magkaroon ng mga karagdagang singil."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Magdagdag ng network"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Mga Wi-Fi network"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Push Button ng WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KUMONEKTA"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Walang access sa Internet ang network na ito. Manatiling nakakonekta?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Huwag nang tanungin muli sa network na ito"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Hindi konektado ang Wi-Fi sa Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Maaari kang lumipat sa cellular network tuwing pangit ang koneksyon ng Wi-Fi. Maaaring pairalin ang paggamit ng data."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Lumipat sa cellular"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Manatili sa Wi‑Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Huwag kailanman ipakitang muli"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Mga Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Mga effect sa musika"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Volume ng pag-ring"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset hanggang sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Oras ng pagsisimula"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Oras ng pagtatapos"</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">"Naka-off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Hindi awtomatikong mag-o-on kailanman."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Awtomatikong mag-o-on nang <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Awtomatikong mag-o-on sa sunset."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Naka-on. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Hindi awtomatikong mag-o-off kailanman."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Awtomatikong mag-o-off nang <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Awtomatikong mag-o-off sa sunrise."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Bersyon ng Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Antas ng patch ng seguridad ng Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID ng Kagamitan"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Bersyon ng baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Bersyon ng Kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Iba Pa"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"I-explore ang <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">"Kasama sa iba ang mga nakabahaging file na na-save ng mga app, file na na-download mula sa Internet o Bluetooth, file ng Android at iba pa. \n\nUpang makita ang mga nakikitang content ng <xliff:g id="NAME">^1</xliff:g> na ito, i-tap ang I-explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Kasama sa system ang mga file na hindi maipapakita ng Android nang isa-isa."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Maaaring may mga naka-save na larawan, musika, pelikula, app o iba pang data si <xliff:g id="USER_0">^1</xliff:g> na gumagamit ng <xliff:g id="SIZE">^2</xliff:g> ng storage. \n\nUpang makita ang mga detalye, lumipat kay <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"I-set up ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gamitin bilang portable na storage"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Access na Huwag Istorbohin"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Walang mga naka-install na app ang humiling ng access na Huwag Istorbohin"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Mga Channel"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Huwag kailanman magpakita ng mga notification mula sa app na ito"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"I-block lahat"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Huwag kailanman magpakita ng mga notification mula sa channel na ito"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"I-override ang Huwag Istorbohin"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Pahintulutan ang mga notification na ito na lumabas kapag nakatakda sa Priyoridad Lang ang Huwag Istorbohin"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sa lock screen"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitibo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tapos na"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Kahalagahan"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Palaging pailawin ang pulse notification"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Palaging i-vibrate"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Pangalan ng panuntunan"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ilagay ang pangalan ng panuntunan"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ginagamit na ang pangalan ng panuntunan"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Mga paghihigpit sa network"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Maaaring maiba ang accounting ng data ng carrier mula sa accounting ng device"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Magtakda ng babala sa data"</string>
     <string name="data_warning" msgid="209133958008062117">"Babala sa paggamit ng data"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Itakda ang limitasyon ng data"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limitasyon ng data"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e5c97cc..734e5fd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/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">"Parmak iziyle kilit açma"</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">"Parmak izinizi kullanma"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Kimin parmak izini eklediğinize dikkat etmeniz gerekir. Eklenen tek bir parmak iziyle bile bu işlemlerin tümü yapılabilir.\n\nNot: Parmak iziniz, güçlü bir desenden veya PIN\'den daha az güvenli olabilir."</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">"Satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Kimlerin parmak izini eklediğinize dikkat edin. Eklenen tek parmak izi bile bunların tümünü yapabilir.\n\nNot: Bu cihazın kilidini açmak için parmak izinizi kullanamazsınız. Daha fazla bilgi edinmek için kuruluşunuzun yöneticisiyle iletişim kurun."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonunuzun kilidini açmak, satın alma işlemlerini onaylamak veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Parmak izlerini ekleyeceğiniz kişiler konusunda dikkatli olun. Eklenen tek bir parmak iziyle bile bu işlemlerin tümü yapılabilir.\n\nNot: Parmak iziniz, güçlü bir desenden veya PIN\'den daha az güvenli olabilir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"İptal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Devam"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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ç"</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>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Ana Ekran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Müzik efektleri"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Zil sesi düzeyi"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Güneşin batışından doğuşuna"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Başlangıç zamanı"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Bitiş zamanı"</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">"Kapalı. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Hiçbir zaman otomatik olarak açılmayacak."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Şu saatte otomatik olarak açılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Güneş battığında otomatik olarak açılacak."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Açık. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Hiçbir zaman otomatik olarak kapatılmayacak."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Şu saatte otomatik olarak kapatılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Güneş doğduğunda otomatik olarak kapatılacak."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android sürümü"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android güvenlik yaması düzeyi"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Cihaz Kimliği"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Ana bant sürümü"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Çekirdek sürümü"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Diğer"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> birimini keşfet"</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">"Diğerleri arasında, uygulamalar tarafından kaydedilmiş paylaşılan dosyalar, İnternet\'ten veya Bluetooth üzerinden indirilen dosyalar, Android dosyaları vb. bulunur.\n\nBu <xliff:g id="NAME">^1</xliff:g> depolama cihazındaki görünebilir içeriği görmek için Keşfet\'e dokunun."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem, Android\'in ayrı olarak görüntüleyemeyeceği dosyalar içeriyor."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>, en fazla <xliff:g id="SIZE">^2</xliff:g> depolama alanı kaplayan kaydedilmiş fotoğraflar, müzik, film, uygulama veya diğer verileri içerebilir. \n\nAyrıntıları görmek için <xliff:g id="USER_1">^1</xliff:g> kullanıcısına geçiş yapın."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazınızı kurun"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Taşınabilir bir depolama birimi kullanın"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Ağ kısıtlamaları"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Operatörünüzün veri kullanımı hesaplaması, cihazdaki hesaplamadan farklı olabilir"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Veri uyarısı oluşturun"</string>
     <string name="data_warning" msgid="209133958008062117">"Veri uyarısı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Veri sınırı ayarla"</string>
     <string name="data_limit" msgid="1885406964934590552">"Veri sınırı"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c8abfbe..c562706 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -349,11 +349,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>
@@ -705,6 +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>
+    <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>
@@ -782,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
@@ -883,8 +880,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>
@@ -956,22 +952,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>
@@ -1038,8 +1026,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">"Ідентифікатор обладнання"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Версія модуля зв’язку"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версія ядра"</string>
@@ -1170,10 +1157,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">"Інше – це файли, збережені додатками чи завантажені через Інтернет або 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>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Використовувати як портативний пристрій пам’яті"</string>
@@ -2716,8 +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>
+    <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>
+    <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>
@@ -2726,6 +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>
+    <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>
@@ -3153,8 +3143,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-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index c4c118a..33b6199 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/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>
@@ -677,6 +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>
+    <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>
@@ -754,14 +754,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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"بھول جائیں"</string>
@@ -855,8 +852,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>
@@ -928,22 +924,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>
@@ -1008,8 +996,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>
@@ -1140,10 +1127,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>
@@ -2662,8 +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>
+    <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>
+    <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>
@@ -2672,6 +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>
+    <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>
@@ -3083,8 +3073,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-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 769d872..65d9a58 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/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">"Barmoq izi skaneri"</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">"Barmoq izidan foydalanish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefon qulfini ochish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun undan ehtiyot bo‘lib foydalaning.\n\nEslatma: Barmoq izining himoya darajasi grafik kalit yoki PIN kodga qaraganda kuchsizroq."</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">"Xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot undan bo‘lib foydalaning.\n\nEslatma: barmoq izi orqali qurilmani qulfdan chiqara olmaysiz. Batafsil ma’lumot olish uchun tashkilot administratori bilan bog‘laning."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot undan bo‘lib foydalaning.\n\nEslatma: Barmoq izining himoya darajasi chizmali kalit yoki PIN kodnikidek emas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davom etish"</string>
@@ -687,6 +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>
+    <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>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ULANISH"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Bu tarmoqda internet aloqasi yo‘q. Shu tarmoqda qolasizmi?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Bu tarmoq uchun boshqa so‘ralmasin"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"O‘chirish"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Uyga"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ovoz"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ovoz balandligi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiqa effektlari"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Qo‘ng‘iroq ovozi"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Kun botishidan to chiqqunicha"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Boshlanish vaqti"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Tugash vaqti"</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">"O‘chiq. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Hech qachon avtomatik yoqilmaydi."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik yoqiladi."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Quyosh botishi bilan avtomatik yoqiladi."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Yoniq. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Hech qachon avtomatik o‘chirib qo‘yilmaydi."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik o‘chirib qo‘yiladi."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Quyosh chiqishi bilan avtomatik o‘chirib qo‘yiladi."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyqu rejimi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan so‘ng"</string>
@@ -1018,8 +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>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <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>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Boshqa"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Tizim"</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">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Android tizimi fayllarini alohida ko‘rib bo‘lmaydi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> rasm, musiqa, film, ilova yoki <xliff:g id="SIZE">^2</xliff:g> xotirani egallagan boshqa ma’lumotlarni saqlagan bo‘lishi mumkin. \n\nTafsilotlarni ko‘rish uchun <xliff:g id="USER_1">^1</xliff:g> profiliga o‘ting."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Tarmoq cheklovlari"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Trafik sarfiga ogohlantirish o‘rnatish"</string>
     <string name="data_warning" msgid="209133958008062117">"Ogohlantirishlar"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Trafik cheklovini o‘rnatish"</string>
     <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovini o‘rnatish"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c23074c..de573b6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/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">"Mở khóa bằng vân tay"</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">"Sử dụng vân tay của bạn"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Chỉ cần chạm vào cảm biến vân tay để mở khóa điện thoại của bạn, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng với vân tay mà bạn thêm. Thậm chí một vân tay được thêm cũng có thể làm tất cả những việc này.\n\nLưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình mở khóa hoặc mã PIN mạnh."</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">"Chỉ cần chạm vào cảm biến vân tay để ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng với vân tay mà bạn thêm. Thậm chí một vân tay được thêm có thể làm tất cả những việc này.\n\nLưu ý: Bạn không thể sử dụng vân tay của mình để mở khóa thiết bị này. Để biết thêm thông tin, hãy liên hệ với quản trị viên của tổ chức."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Chỉ cần chạm vào cảm biến vân tay để mở khóa điện thoại của bạn, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng với vân tay mà bạn thêm. Ngay cả một vân tay được thêm cũng có thể làm tất cả những việc này.\n\nLưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình mở khóa hoặc mã PIN mạnh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hủy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tiếp tục"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Giảm thiểu sử dụng pin khi Wi‑Fi bật"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"G.hạn pin được Wi‑Fi sử dụng"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Chuyển sang dữ liệu mạng di động nếu Wi‑Fi mất quyền truy cập Internet."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Dự phòng dữ liệu di động"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Sử dụng dữ liệu di động khi Wi-Fi mất quyền truy cập Internet. Có thể áp dụng phí bổ sung."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Thêm mạng"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Mạng Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"KẾT NỐI"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Mạng này không có quyền truy cập Internet. Giữ kết nối?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Không hỏi lại cho mạng này"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi không kết nối với Internet"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Bạn có thể chuyển sang mạng di động bất cứ khi nào kết nối Wi-Fi kém. Có thể áp dụng phí sử dụng dữ liệu."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Chuyển sang mạng di động"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Luôn sử dụng Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Không bao giờ hiển thị lại"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Trang chủ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Âm lượng"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hiệu ứng âm nhạc"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Âm lượng chuông"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Tối đến sáng"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Thời gian bắt đầu"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Thời gian kết thúc"</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">"Tắt. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Sẽ không bao giờ tự động bật."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Sẽ tự động bật lúc <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Sẽ tự động bật lúc hoàng hôn."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Bật. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Sẽ không bao giờ tự động tắt."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sẽ tự động tắt lúc <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sẽ tự động tắt lúc bình minh."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Thời gian chờ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Phiên bản Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Mức bản vá bảo mật của Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Kiểu"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID thiết bị"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Phiên bản dải tần cơ sở"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Phiên bản Kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Dữ liệu khác"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Hệ thống"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Khám phá <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">"Các tệp khác bao gồm tệp được chia sẻ mà ứng dụng lưu, tệp được tải xuống từ Internet hoặc Bluetooth, tệp Android, v.v. \n\nĐể xem nội dung hiển thị của <xliff:g id="NAME">^1</xliff:g> này, hãy nhấn Khám phá."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Hệ thống bao gồm các tệp mà Android không thể hiển thị riêng."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> có thể đã lưu ứng dụng, phim, nhạc, ảnh hoặc dữ liệu khác chiếm <xliff:g id="SIZE">^2</xliff:g> bộ nhớ. \n\nĐể xem chi tiết, hãy chuyển sang <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Thiết lập <xliff:g id="NAME">^1</xliff:g> của bạn"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sử dụng làm bộ nhớ di động"</string>
@@ -2672,8 +2657,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Kênh"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Không bao giờ hiển thị thông báo từ ứng dụng này"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Chặn tất cả"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Không bao giờ hiển thị thông báo từ kênh này"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ghi đè Không làm phiền"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Cho phép các thông báo này tiếp tục làm gián đoạn khi tính năng Không làm phiền được đặt thành Chỉ ưu tiên."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Trên màn hình khóa"</string>
@@ -2682,6 +2670,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nhạy cảm"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Xong"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Mức độ quan trọng"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Luôn có đèn thông báo dạng xung"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Luôn rung"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Tên quy tắc"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nhập tên quy tắc"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Tên quy tắc đã được sử dụng"</string>
@@ -3093,8 +3083,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Hạn chế của mạng"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Việc tính toán dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
     <string name="data_used_template" msgid="3245919669966296505">"Đã sử dụng <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">"Đặt cảnh báo dữ liệu"</string>
     <string name="data_warning" msgid="209133958008062117">"Cảnh báo dữ liệu"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Đặt giới hạn dữ liệu"</string>
     <string name="data_limit" msgid="1885406964934590552">"Giới hạn dữ liệu"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5def77b..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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <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>
+    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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>
@@ -2672,8 +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>
+    <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>
+    <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>
@@ -2682,6 +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>
+    <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>
@@ -3093,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 6cac45f..adc2a43 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"刪除"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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">"設備編號"</string>
     <string name="baseband_version" msgid="1848990160763524801">"基帶版本"</string>
     <string name="kernel_version" msgid="9192574954196167602">"核心版本"</string>
@@ -1150,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>
@@ -2677,8 +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>
+    <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>
+    <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>
@@ -2687,6 +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>
+    <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>
@@ -3098,8 +3088,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-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 60b1d46..1fc3915 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/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,6 +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>
+    <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>
@@ -764,14 +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>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <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>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
@@ -865,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>
@@ -938,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>
@@ -1018,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>
@@ -1150,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>
@@ -1435,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>
@@ -2143,7 +2128,7 @@
     <string name="remove_account_label" msgid="5921986026504804119">"移除帳戶"</string>
     <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_title" msgid="8800653398717172460">"確定要移除帳戶？"</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>
@@ -2676,8 +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>
+    <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>
+    <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>
@@ -2686,6 +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>
+    <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>
@@ -3097,8 +3087,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-zu/strings.xml b/res/values-zu/strings.xml
index e03b523..fc0aa4e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/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">"Vula ngezigxivizo zeminwe"</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">"Sebenzisa izigxivizo zakho zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zakabani. Nezigxivizo ezizodwa ezingeziwe zingenza zonke lezi zinto.\n\nYazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma i-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">"Vele uthinte inzwa yezigxivizo zeminwe ukuze ugunyaze ukuthenga, noma ngena ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zikabani. Nezigxivizo ezizodwa ezingeziwe zingenza noma iziphi zalezi zinto.\n\nYazi: Awukwazi ukusebenzisa izigxivizo zakho zeminwe ukuze uvule le divayisi. Ukuze uthole olunye ulwazi, xhumana nomqondisi wenhlangano yakho."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zakabani. Nezigxivizo ezizodwa ezingeziwe zingenza zonke lezi zinto.\n\nYazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma iphinikhodi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Khansela"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Qhubeka"</string>
@@ -687,6 +685,8 @@
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Nciphisa ukusetshenziswa kwebhethri uma i-Wi-Fi ivuliwe"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Khawulela ibhethri elisetshenziswe yi-Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1410499115509796174">"Shintshela kudatha yeselula uma ngabe i-Wi-Fi ilahlekelwa ukufinyelela kwe-inthanethi."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="341508634673327078">"Ukubuyela emuva kwedatha yeselula"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="1960608487363658949">"Sebenzisa idatha yeselula uma i-Wi-Fi ilahlekelwa ukufinyelela kwe-inthanethi. Izindleko ezingeziwe zingasebenza."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Amanethiwekhi e-Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Inkinobho yokuphusha ye-WPS"</string>
@@ -764,14 +764,11 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"XHUMA"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Le nethiwekhi ayinakho ukufinyelela kwe-inthanethi. Hlala uxhumekile?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ungaphindi ubuze ngale nethiwekhi"</string>
-    <!-- no translation found for lost_internet_access_title (2782009158012212777) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_text (1495142182934624433) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_switch (1157476782808342810) -->
-    <skip />
-    <!-- no translation found for lost_internet_access_cancel (8438722278965609900) -->
-    <skip />
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"I-Wi-Fi ayixhunyiwe kwi-inthanethi"</string>
+    <string name="lost_internet_access_text" msgid="1676124057345106398">"Ungashintshela kunethiwekhi yeselula noma kunini lapho i-Wi-Fi inokuxhumeka okubi. Kungasebenza idatha."</string>
+    <string name="lost_internet_access_switch" msgid="1980357004205108781">"Shintshela kuselula"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Hlala ku-Wi-Fi"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ungaphinde uveze"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
@@ -865,8 +862,7 @@
     <string name="home_settings" msgid="212375129455718176">"Ikhaya"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
-    <!-- no translation found for ringtone_summary (1688079785311826667) -->
-    <skip />
+    <string name="ringtone_summary" msgid="1688079785311826667">" "</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Imphumelo Yomculo"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Ivolumu yokukhalisa"</string>
@@ -938,22 +934,14 @@
     <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Ukushona kwelanga nokuphuma kwalo"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Isikhathi sokuqala"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Isikhathi sokuphela"</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">"Kuvaliwe. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ngeke ize ivuleke ngokuzenzakalela."</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Izovula ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Izovuleka ngokuzenzakalela ekushoneni kwelanga."</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Kuvuliwe. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ngeke ize ivaleke ngokuzenzakalela."</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Izovaleka ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Izovaleka ngokuzenzakalela ekuphumeni kwelanga."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -1018,8 +1006,7 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Inguqulo ye-Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Ileveli yokuvikeleka ye-Android"</string>
-    <!-- no translation found for model_info (1952009518045740889) -->
-    <skip />
+    <string name="model_info" msgid="1952009518045740889">"Imodeli"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"I-ID yempahla"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Inguqulo ye-Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Inguqulo ye-Kernel"</string>
@@ -1150,10 +1137,8 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"Okunye"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Isistimu"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Hlola i-<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">"Amanye amafayela afakiwe abiwe alondolozwe ngezinhlelo zokusebenza, amafayela alandwe kusukela ku-inthanethi noma ku-Bluetooth, amafayela e-Android, njalo njalo. \n\nUkuze ubone okuqukethwe okubonakalayo kwale-<xliff:g id="NAME">^1</xliff:g>, thepha okuthi Hlola."</string>
+    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Isistimu ifaka amafayela i-Android engakwazi ukuwabonisa ngawodwana."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ingahle ilondoloze izithombe, umculo, ama-movie, izinhlelo zokusebenza, nenye idatha ethatha u-<xliff:g id="SIZE">^2</xliff:g> wesitoreji. \n\nUkuze ubuke imininingwane, shintshela ku-<xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setha i-<xliff:g id="NAME">^1</xliff:g> yakho"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sebenzisa njengesitoreji esiphathekayo"</string>
@@ -2673,8 +2658,11 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
+    <string name="notification_channels" msgid="8681423709659818791">"Iziteshi"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ungalokothi ubonise izaziso kusuka kulolu hlelo lokusebenza"</string>
+    <string name="channel_notification_block_title" msgid="1570538726036580979">"Vimbela konke"</string>
+    <string name="channel_notification_block_summary" msgid="3024773079420038146">"Ungalokothi ubonise izaziso ezivela kulesi siteshi"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bhala ngaphezulu okuthi ungaphazamisi"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Vumela lezi zaziso ziqhubeke nokuphazamisa uma okuthi ungaphazamisi kusethelwe okuphezulu kuphela"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekukhiyeni kwesikrini"</string>
@@ -2683,6 +2671,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ukuzwela"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kwenziwe"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Ukubaluleka"</string>
+    <string name="notification_show_lights_title" msgid="7301956309661349031">"Hlala wenza i-pulse yokukhanya kwesaziso"</string>
+    <string name="notification_vibrate_title" msgid="4942317478973441720">"Hlala udlidliza"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Igama lesimiso"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Faka igama lesimiso"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Igama lesimiso selivele liyasetshenziswa"</string>
@@ -3094,8 +3084,7 @@
     <string name="network_restrictions" msgid="8234695294536675380">"Imikhawulo yenethiwekhi"</string>
     <string name="operator_warning" msgid="1862988028996859195">"Ukubalwa kwedatha yenkampani yenethiwekhi kungahluka kusuka ekubaleni kwedivayisi"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenzisiwe"</string>
-    <!-- no translation found for set_data_warning (6115364758236594593) -->
-    <skip />
+    <string name="set_data_warning" msgid="6115364758236594593">"Setha isexwayiso sedatha"</string>
     <string name="data_warning" msgid="209133958008062117">"Isexwayiso sedatha"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Setha umkhawulo wedatha"</string>
     <string name="data_limit" msgid="1885406964934590552">"Umkhawulo wedatha"</string>

diff --git a/res/values/config.xml b/res/values/config.xml
index c8ea171..75d8697 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml

@@ -55,4 +55,7 @@
     <!-- When true enable gesture setting. -->
     <bool name="config_gesture_settings_enabled">false</bool>
 
+    <!-- If the Storage Manager settings are enabled. -->
+    <bool name="config_storage_manager_settings_enabled">false</bool>
+
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33903dd..ef9c3dd 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] -->
@@ -1659,6 +1659,10 @@
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
     <string name="wifi_show_advanced">Advanced options</string>
+    <!-- Message for talkback to say when Advanced Options expanded [CHAR LIMIT=NONE] -->
+    <string name="wifi_advanced_toggle_description_expanded">Drop down list Advanced Options. Double-tap to collapse.</string>
+    <!-- Message for talkback to say when Advanced Options is collapsed [CHAR LIMIT=NONE] -->
+    <string name="wifi_advanced_toggle_description_collapsed">Drop down list Advanced Options. Double-tap to expand.</string>
     <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
     <string name="wifi_wps_setup_title">Wi\u2011Fi Protected Setup</string>
     <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -2178,7 +2182,7 @@
     <!-- Night display screen, setting option name to enable night display (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
     <string name="night_display_title">Night Light</string>
     <!-- Night display screen, description of night display feature (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
-    <string name="night_display_text">Night Light tints your screen red. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily.</string>
+    <string name="night_display_text">Night Light tints your screen amber. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily.</string>
     <!-- Night display screen, category title for settings to schedule when night display activates automatically. [CHAR LIMIT=30] -->
     <string name="night_display_category_schedule">Schedule</string>
     <!-- Night display screen, category title for settings to manually activate night display. [CHAR LIMIT=30] -->
@@ -2253,7 +2257,7 @@
     <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
     <string name="doze_title">Ambient display</string>
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
-    <string name="doze_summary">Wake screen when you double-tap it or get new notifications. See how</string>
+    <string name="doze_summary">Wake screen when you receive notifications</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->
@@ -6260,13 +6264,14 @@
     </string>
 
     <!-- Title for what display preferences are applied when device is in VR mode -->
-    <string name="display_vr_pref_title">When device is in VR mode</string>
+    <string name="display_vr_pref_title">When device is in VR</string>
 
     <!-- [CHAR LIMIT=70] Put display into low-persistence mode, this decreases motion blur. -->
-    <string name="display_vr_pref_low_persistence">Use low motion blur settings</string>
+    <string name="display_vr_pref_low_persistence">Reduce blur (recommended)</string>
 
-    <!-- [CHAR LIMIT=70] Do not change display settings. -->
-    <string name="display_vr_pref_off">Do nothing</string>
+    <!-- [CHAR LIMIT=70] Do not change default display settings, this may reduce perceived screen
+         flicker while in VR mode. -->
+    <string name="display_vr_pref_off">Reduce flicker</string>
 
     <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
     <string name="manage_zen_access_title">Do Not Disturb access</string>
@@ -7271,11 +7276,10 @@
     <!-- Summary of storage usage [CHAR LIMIT=NONE] -->
     <string name="storage_summary"><xliff:g id="size1" example="8GB">%1$s</xliff:g> of <xliff:g id="size2" example="32GB">%2$s</xliff:g> used</string>
 
-    <!-- Summary of display with adaptive brightness on [CHAR LIMIT=NONE] -->
-    <string name="display_summary_on">Adaptive brightness is ON</string>
-
-    <!-- Summary of display with adaptive brightness off [CHAR LIMIT=NONE] -->
-    <string name="display_summary_off">Adaptive brightness is OFF</string>
+    <!-- Summary of display with screen sleep timeout [CHAR LIMIT=NONE] -->
+    <string name="display_summary">Sleep after <xliff:g id="timeout_description" example="10 minutes">%1$s</xliff:g> of inactivity</string>
+    <!-- Example summary of display used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->
+    <string name="display_summary_example">Sleep after 10 minutes of inactivity</string>
 
     <!-- Summary of memory screen [CHAR LIMIT=NONE] -->
     <string name="memory_summary">Avg <xliff:g id="used_memory" example="1.7GB">%1$s</xliff:g> of <xliff:g id="total_memory" example="2GB">%2$s</xliff:g> memory used</string>
@@ -7367,7 +7371,7 @@
     <string name="condition_night_display_title">Night Light is on</string>
 
     <!-- Summary of condition that night display is on (renamed "Night Light" with title caps) [CHAR LIMIT=NONE] -->
-    <string name="condition_night_display_summary">Screen is tinted red. This may help you fall asleep.</string>
+    <string name="condition_night_display_summary">Screen is tinted amber. This may help you fall asleep.</string>
 
     <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
     <string name="suggestions_title">Suggestions</string>
@@ -7823,11 +7827,29 @@
     <!-- Summary text for double twist for camera mode  [CHAR LIMIT=160]-->
     <string name="double_twist_for_camera_mode_summary"></string>
 
-    <!-- Title text for ambient display [CHAR LIMIT=60]-->
-    <string name="ambient_display_title">Quick screen check</string>
+    <!-- Title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
+    <string name="ambient_display_title" product="default">Double-tap to check phone</string>
+    <!-- Title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->
+    <string name="ambient_display_title" product="tablet">Double-tap to check tablet</string>
+    <!-- Title text for ambient display double tap (device) [CHAR LIMIT=60]-->
+    <string name="ambient_display_title" product="device">Double-tap to check device</string>
 
-    <!-- Summary text for ambient display [CHAR LIMIT=160]-->
-    <string name="ambient_display_summary">To check your phone without waking it up fully, double-tap it or pick it up</string>
+    <!-- Summary text for ambient display double tap [CHAR LIMIT=160]-->
+    <string name="ambient_display_summary">To quickly check your notifications, double-tap your screen</string>
+
+    <!-- Title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
+    <string name="ambient_display_pickup_title" product="default">Lift to check phone</string>
+    <!-- Title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
+    <string name="ambient_display_pickup_title" product="tablet">Lift to check tablet</string>
+    <!-- Title text for ambient display pick up (device) [CHAR LIMIT=60]-->
+    <string name="ambient_display_pickup_title" product="device">Lift to check device</string>
+
+    <!-- Summary text for ambient display (phone) [CHAR LIMIT=160]-->
+    <string name="ambient_display_pickup_summary" product="default">To quickly check your notifications, pick up your phone</string>
+    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=160]-->
+    <string name="ambient_display_pickup_summary" product="tablet">To quickly check your notifications, pick up your tablet</string>
+    <!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
+    <string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device</string>
 
     <!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index b8fee49..66cf8f4 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml

@@ -15,6 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/about_settings">
 
         <!-- System update settings - launches activity -->
@@ -70,11 +71,15 @@
         </PreferenceScreen>
 
         <!-- Device hardware model -->
-        <Preference android:key="device_model"
+        <com.android.settings.DividerPreference
+                android:key="device_model"
                 android:enabled="false"
                 android:shouldDisableView="false"
+                android:selectable="false"
                 android:title="@string/model_info"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/device_info_default"
+                settings:allowDividerAbove="true"
+                settings:allowDividerBelow="true"/>
 
         <!-- Device firmware version -->
         <Preference android:key="firmware_version"
@@ -92,25 +97,37 @@
         </PreferenceScreen>
 
         <!-- Device FCC equipment id -->
-        <Preference android:key="fcc_equipment_id"
+        <com.android.settings.DividerPreference
+                android:key="fcc_equipment_id"
                 android:enabled="false"
                 android:shouldDisableView="false"
+                android:selectable="false"
                 android:title="@string/fcc_equipment_id"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/device_info_default"
+                settings:allowDividerAbove="true"
+                settings:allowDividerBelow="true"/>
 
         <!-- Device Baseband version -->
-        <Preference android:key="baseband_version"
+        <com.android.settings.DividerPreference
+                android:key="baseband_version"
                 android:enabled="false"
                 android:shouldDisableView="false"
+                android:selectable="false"
                 android:title="@string/baseband_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/device_info_default"
+                settings:allowDividerAbove="true"
+                settings:allowDividerBelow="true"/>
 
         <!-- Device Kernel version -->
-        <Preference android:key="kernel_version"
+        <com.android.settings.DividerPreference
+                android:key="kernel_version"
                 android:enabled="false"
                 android:shouldDisableView="false"
+                android:selectable="false"
                 android:title="@string/kernel_version"
-                android:summary="@string/device_info_default"/>
+                android:summary="@string/device_info_default"
+                settings:allowDividerAbove="true"
+                settings:allowDividerBelow="true"/>
 
         <!-- Detailed build version -->
         <Preference android:key="build_number"
@@ -120,10 +137,14 @@
                 android:summary="@string/device_info_default"/>
 
         <!-- SELinux status information -->
-        <Preference android:key="selinux_status"
+        <com.android.settings.DividerPreference
+                android:key="selinux_status"
                 android:enabled="false"
                 android:shouldDisableView="false"
+                android:selectable="false"
                 android:title="@string/selinux_status"
-                android:summary="@string/selinux_status_enforcing"/>
+                android:summary="@string/selinux_status_enforcing"
+                settings:allowDividerAbove="true"
+                settings:allowDividerBelow="true"/>
 
 </PreferenceScreen>

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index e797b4f..b5e2848 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml

@@ -79,19 +79,10 @@
                 android:key="lift_to_wake"
                 android:title="@string/lift_to_wake_title" />
 
-        <PreferenceScreen
+        <SwitchPreference
                 android:key="doze"
-                android:title="@string/ambient_display_title"
-                android:summary="@string/doze_summary" >
-                <intent
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >
-                    <extra android:name="show_drawer_menu"
-                           android:value="true" />
-                    <extra android:name="gesture_scroll_to_preference"
-                           android:value="gesture_pick_up_and_nudge" />
-                </intent>
-        </PreferenceScreen>
+                android:title="@string/doze_title"
+                android:summary="@string/doze_summary" />
 
         <SwitchPreference
                 android:key="tap_to_wake"

diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
index c5d4ab4..af365bf 100644
--- a/res/xml/gesture_settings.xml
+++ b/res/xml/gesture_settings.xml

@@ -20,10 +20,10 @@
     settings:keywords="@string/keywords_gesture">
 
     <com.android.settings.gestures.GesturePreference
-            android:key="gesture_swipe_down_fingerprint"
-            android:title="@string/fingerprint_swipe_for_notifications_title"
-            android:summary="@string/fingerprint_swipe_for_notifications_summary"
-            settings:animation="@raw/gesture_fingerprint_swipe"/>
+        android:key="gesture_swipe_down_fingerprint"
+        android:title="@string/fingerprint_swipe_for_notifications_title"
+        android:summary="@string/fingerprint_swipe_for_notifications_summary"
+        settings:animation="@raw/gesture_fingerprint_swipe"/>
 
     <com.android.settings.gestures.GesturePreference
         android:key="gesture_double_tap_power"
@@ -38,9 +38,15 @@
         settings:animation="@raw/gesture_twist"/>
 
     <com.android.settings.gestures.GesturePreference
-        android:key="gesture_pick_up_and_nudge"
+        android:key="gesture_double_tap_screen"
         android:title="@string/ambient_display_title"
         android:summary="@string/ambient_display_summary"
         settings:animation="@raw/gesture_ambient_tap"/>
 
+    <com.android.settings.gestures.GesturePreference
+        android:key="gesture_pick_up"
+        android:title="@string/ambient_display_pickup_title"
+        android:summary="@string/ambient_display_pickup_summary"
+        settings:animation="@raw/gesture_ambient_lift"/>
+
 </PreferenceScreen>
\ No newline at end of file

diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 950d52a..56a4ca0 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java

@@ -27,21 +27,21 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.TelephonyProperties;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.WirelessUtils;
 
 public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {
 
+    private static final int EVENT_SERVICE_STATE_CHANGED = 3;
+
     private final Context mContext;
+    private final SwitchPreference mSwitchPref;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private PhoneStateIntentReceiver mPhoneStateReceiver;
-    
-    private final SwitchPreference mSwitchPref;
-
-    private static final int EVENT_SERVICE_STATE_CHANGED = 3;
 
     private Handler mHandler = new Handler() {
         @Override
@@ -61,19 +61,21 @@
         }
     };
 
-    public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeSwitchPreference) {
-        
+    public AirplaneModeEnabler(Context context, SwitchPreference airplaneModeSwitchPreference,
+            MetricsFeatureProvider metricsFeatureProvider) {
+
         mContext = context;
         mSwitchPref = airplaneModeSwitchPreference;
+        mMetricsFeatureProvider = metricsFeatureProvider;
 
         airplaneModeSwitchPreference.setPersistent(false);
-    
+
         mPhoneStateReceiver = new PhoneStateIntentReceiver(mContext, mHandler);
         mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
     }
 
     public void resume() {
-        
+
         mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
 
         mPhoneStateReceiver.registerIntent();
@@ -82,7 +84,7 @@
                 Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true,
                 mAirplaneModeObserver);
     }
-    
+
     public void pause() {
         mPhoneStateReceiver.unregisterIntent();
         mSwitchPref.setOnPreferenceChangeListener(null);
@@ -91,11 +93,11 @@
 
     private void setAirplaneModeOn(boolean enabling) {
         // Change the system setting
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 
-                                enabling ? 1 : 0);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON,
+                enabling ? 1 : 0);
         // Update the UI to reflect system setting
         mSwitchPref.setChecked(enabling);
-        
+
         // Post the intent
         Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
         intent.putExtra("state", enabling);
@@ -113,17 +115,17 @@
     private void onAirplaneModeChanged() {
         mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
     }
-    
+
     /**
      * Called when someone clicks on the checkbox preference.
      */
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (Boolean.parseBoolean(
-                    SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
+                SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
             // In ECM mode, do not update database at this point
         } else {
             Boolean value = (Boolean) newValue;
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value);
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value);
             setAirplaneModeOn(value);
         }
         return true;

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

@@ -20,11 +20,13 @@
 import android.app.Dialog;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.provider.Telephony;
 import android.support.v14.preference.MultiSelectListPreference;
 import android.support.v14.preference.SwitchPreference;
@@ -32,6 +34,7 @@
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.telephony.CarrierConfigManager;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -46,8 +49,12 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.util.ArrayUtils;
 
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import static android.app.Activity.RESULT_OK;
@@ -106,6 +113,9 @@
     private int mBearerInitialVal = 0;
     private String mMvnoTypeStr;
     private String mMvnoMatchDataStr;
+    private String[] mReadOnlyApnTypes;
+    private String[] mReadOnlyApnFields;
+    private boolean mReadOnlyApn;
 
     /**
      * Standard projection for the interesting columns of a normal note.
@@ -133,7 +143,8 @@
             Telephony.Carriers.BEARER_BITMASK, // 19
             Telephony.Carriers.ROAMING_PROTOCOL, // 20
             Telephony.Carriers.MVNO_TYPE,   // 21
-            Telephony.Carriers.MVNO_MATCH_DATA  // 22
+            Telephony.Carriers.MVNO_MATCH_DATA,  // 22
+            Telephony.Carriers.EDITED   // 23
     };
 
     private static final int ID_INDEX = 0;
@@ -158,6 +169,7 @@
     private static final int ROAMING_PROTOCOL_INDEX = 20;
     private static final int MVNO_TYPE_INDEX = 21;
     private static final int MVNO_MATCH_DATA_INDEX = 22;
+    private static final int EDITED_INDEX = 23;
 
 
     @Override
@@ -196,6 +208,9 @@
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         mFirstTime = icicle == null;
+        mReadOnlyApn = false;
+        mReadOnlyApnTypes = null;
+        mReadOnlyApnFields = null;
 
         if (action.equals(Intent.ACTION_EDIT)) {
             Uri uri = intent.getData();
@@ -204,6 +219,17 @@
                 finish();
                 return;
             }
+            CarrierConfigManager configManager = (CarrierConfigManager)
+                    getSystemService(Context.CARRIER_CONFIG_SERVICE);
+            if (configManager != null) {
+                PersistableBundle b = configManager.getConfig();
+                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;
         } else if (action.equals(Intent.ACTION_INSERT)) {
             if (mFirstTime || icicle.getInt(SAVED_POS) == 0) {
@@ -245,6 +271,17 @@
 
         mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
 
+        Log.d(TAG, "onCreate: EDITED " + mCursor.getInt(EDITED_INDEX));
+        // if it's not a USER_EDITED apn, check if it's read-only
+        if (mCursor.getInt(EDITED_INDEX) != Telephony.Carriers.USER_EDITED &&
+                apnTypesMatch(mReadOnlyApnTypes, mCursor.getString(TYPE_INDEX))) {
+            Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
+            mReadOnlyApn = true;
+            disableAllFields();
+        } else if (!ArrayUtils.isEmpty(mReadOnlyApnFields)) {
+            disableFields(mReadOnlyApnFields);
+        }
+
         for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
             getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
         }
@@ -252,6 +289,153 @@
         fillUi();
     }
 
+    /**
+     * Check if passed in array of APN types indicates all APN types
+     * @param apnTypes array of APN types. "*" indicates all types.
+     * @return true if all apn types are included in the array, false otherwise
+     */
+    private boolean hasAllApns(String[] apnTypes) {
+        if (ArrayUtils.isEmpty(apnTypes)) {
+            return false;
+        }
+
+        List apnList = Arrays.asList(apnTypes);
+        if (apnList.contains(PhoneConstants.APN_TYPE_ALL)) {
+            Log.d(TAG, "hasAllApns: true because apnList.contains(PhoneConstants.APN_TYPE_ALL)");
+            return true;
+        }
+        for (String apn : PhoneConstants.APN_TYPES) {
+            if (!apnList.contains(apn)) {
+                return false;
+            }
+        }
+
+        Log.d(TAG, "hasAllApns: true");
+        return true;
+    }
+
+    /**
+     * Check if APN types overlap.
+     * @param apnTypesArray1 array of APNs. Empty array indicates no APN type; "*" indicates all
+     *                       types
+     * @param apnTypes2 comma separated string of APN types. Empty string represents all types.
+     * @return if any apn type matches return true, otherwise return false
+     */
+    private boolean apnTypesMatch(String[] apnTypesArray1, String apnTypes2) {
+        if (ArrayUtils.isEmpty(apnTypesArray1)) {
+            return false;
+        }
+
+        if (hasAllApns(apnTypesArray1) || TextUtils.isEmpty(apnTypes2)) {
+            return true;
+        }
+
+        List apnTypesList1 = Arrays.asList(apnTypesArray1);
+        String[] apnTypesArray2 = apnTypes2.split(",");
+
+        for (String apn : apnTypesArray2) {
+            if (apnTypesList1.contains(apn.trim())) {
+                Log.d(TAG, "apnTypesMatch: true because match found for " + apn.trim());
+                return true;
+            }
+        }
+
+        Log.d(TAG, "apnTypesMatch: false");
+        return false;
+    }
+
+    /**
+     * 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() {
+        mName.setEnabled(false);
+        mApn.setEnabled(false);
+        mProxy.setEnabled(false);
+        mPort.setEnabled(false);
+        mUser.setEnabled(false);
+        mServer.setEnabled(false);
+        mPassword.setEnabled(false);
+        mMmsProxy.setEnabled(false);
+        mMmsPort.setEnabled(false);
+        mMmsc.setEnabled(false);
+        mMcc.setEnabled(false);
+        mMnc.setEnabled(false);
+        mApnType.setEnabled(false);
+        mAuthType.setEnabled(false);
+        mProtocol.setEnabled(false);
+        mRoamingProtocol.setEnabled(false);
+        mCarrierEnabled.setEnabled(false);
+        mBearerMulti.setEnabled(false);
+        mMvnoType.setEnabled(false);
+        mMvnoMatchData.setEnabled(false);
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.APN_EDITOR;
@@ -540,7 +724,7 @@
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         // If it's a new APN, then cancel will delete the new entry in onPause
-        if (!mNewApn) {
+        if (!mNewApn && !mReadOnlyApn) {
             menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
                 .setIcon(R.drawable.ic_menu_delete);
         }

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/BackupSettingsActivity.java b/src/com/android/settings/BackupSettingsActivity.java
index 94e9691..a4cc4b7 100644
--- a/src/com/android/settings/BackupSettingsActivity.java
+++ b/src/com/android/settings/BackupSettingsActivity.java

@@ -17,8 +17,13 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.backup.BackupManager;
+import android.app.backup.IBackupManager;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.ServiceManager;
+import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -43,6 +48,17 @@
                 Intent intent = Intent.parseUri(backup, 0);
                 if (intent.resolveActivity(getPackageManager()) != null) {
                     // use startActivityForResult to let the activity check the caller signature
+                    IBackupManager bmgr = IBackupManager.Stub.asInterface(
+                            ServiceManager.getService(Context.BACKUP_SERVICE));
+                    boolean backupOkay;
+                    try {
+                        backupOkay = bmgr.isBackupServiceActive(UserHandle.myUserId());
+                    } catch (Exception e) {
+                        // things go wrong talking to the backup system => ignore and
+                        // pass the default 'false' as the "backup is a thing?" state.
+                        backupOkay = false;
+                    }
+                    intent.putExtra(BackupManager.EXTRA_BACKUP_SERVICES_AVAILABLE, backupOkay);
                     startActivityForResult(intent, -1);
                 } else {
                     Log.e(TAG, "Backup component not found!");

diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index ace71c3..e929d3d 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java

@@ -21,24 +21,19 @@
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Handler;
 import android.os.RemoteException;
-import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckedTextView;
-import android.widget.RadioButton;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.overlay.FeatureFactory;
 
 public class BugreportPreference extends CustomDialogPreference {
 
     private static final String TAG = "BugreportPreference";
-    private static final int BUGREPORT_DELAY_SECONDS = 3;
 
     private CheckedTextView mInteractiveTitle;
     private TextView mInteractiveSummary;
@@ -88,25 +83,14 @@
             final Context context = getContext();
             if (mFullTitle.isChecked()) {
                 Log.v(TAG, "Taking full bugreport right away");
-                MetricsLogger.action(context, MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
+                FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
+                        MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
                 takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL);
             } else {
-                Log.v(TAG, "Taking interactive bugreport in " + BUGREPORT_DELAY_SECONDS + "s");
-                MetricsLogger.action(context,
+                Log.v(TAG, "Taking interactive bugreport right away");
+                FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
                         MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);
-                // Add a little delay before executing, to give the user a chance to close
-                // the Settings activity before it takes a screenshot.
-                final String msg = context.getResources()
-                        .getQuantityString(com.android.internal.R.plurals.bugreport_countdown,
-                                BUGREPORT_DELAY_SECONDS, BUGREPORT_DELAY_SECONDS);
-                Log.v(TAG, msg);
-                Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);
-                    }
-                }, BUGREPORT_DELAY_SECONDS * DateUtils.SECOND_IN_MILLIS);
+                takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);
             }
         }
     }

diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 5d5d54e..1fed189 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java

@@ -38,6 +38,7 @@
 import android.text.format.DateFormat;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -235,6 +236,18 @@
         }
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_DATEPICKER:
+                return MetricsEvent.DIALOG_DATE_PICKER;
+            case DIALOG_TIMEPICKER:
+                return MetricsEvent.DIALOG_TIME_PICKER;
+            default:
+                return 0;
+        }
+    }
+
     static void configureDatePicker(DatePicker datePicker) {
         // The system clock can't represent dates outside this range.
         Calendar t = Calendar.getInstance();

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/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 67a4b15..0e680bc 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java

@@ -19,11 +19,9 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.UiModeManager;
-import android.app.WallpaperManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.ComponentName;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -41,12 +39,10 @@
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.app.NightDisplayController;
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.view.RotationPolicy;
 import com.android.settings.accessibility.ToggleFontSizePreferenceFragment;
@@ -67,7 +63,6 @@
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -97,10 +92,10 @@
     private ListPreference mNightModePreference;
     private Preference mScreenSaverPreference;
     private SwitchPreference mLiftToWakePreference;
+    private SwitchPreference mDozePreference;
     private SwitchPreference mTapToWakePreference;
     private SwitchPreference mAutoBrightnessPreference;
     private SwitchPreference mCameraGesturePreference;
-    private PreferenceScreen mDozePreference;
 
     @Override
     public int getMetricsCategory() {
@@ -144,10 +139,11 @@
             removePreference(KEY_LIFT_TO_WAKE);
         }
 
-        if (!isDozeAvailable(activity)) {
-            removePreference(KEY_DOZE);
+        if (isDozeAvailable(activity)) {
+            mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);
+            mDozePreference.setOnPreferenceChangeListener(this);
         } else {
-            mDozePreference = (PreferenceScreen) findPreference(KEY_DOZE);
+            removePreference(KEY_DOZE);
         }
 
         if (isTapToWakeAvailable(getResources())) {
@@ -194,7 +190,7 @@
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
                     final boolean locked = Integer.parseInt((String) newValue) != 0;
-                    MetricsLogger.action(getActivity(), MetricsEvent.ACTION_ROTATION_LOCK,
+                    mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_ROTATION_LOCK,
                             locked);
                     RotationPolicy.setRotationLock(activity, locked);
                     return true;
@@ -289,31 +285,36 @@
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
         TimeoutListPreference preference = mScreenTimeoutPreference;
+        final CharSequence[] entries = preference.getEntries();
+        final CharSequence[] values = preference.getEntryValues();
         String summary;
         if (preference.isDisabledByAdmin()) {
             summary = getString(R.string.disabled_by_policy_title);
-        } else if (currentTimeout < 0) {
-            // Unsupported value
-            summary = "";
         } else {
-            final CharSequence[] entries = preference.getEntries();
-            final CharSequence[] values = preference.getEntryValues();
-            if (entries == null || entries.length == 0) {
-                summary = "";
-            } else {
-                int best = 0;
-                for (int i = 0; i < values.length; i++) {
-                    long timeout = Long.parseLong(values[i].toString());
-                    if (currentTimeout >= timeout) {
-                        best = i;
-                    }
-                }
-                summary = getString(R.string.screen_timeout_summary, entries[best]);
-            }
+            CharSequence timeoutDescription = getTimeoutDescription(
+                    currentTimeout, entries, values);
+            summary = timeoutDescription == null ? ""
+                    : getString(R.string.screen_timeout_summary, timeoutDescription);
         }
         preference.setSummary(summary);
     }
 
+    private static CharSequence getTimeoutDescription(
+        long currentTimeout, CharSequence[] entries, CharSequence[] values) {
+        if (currentTimeout < 0 || entries == null || values == null
+                || values.length != entries.length) {
+            return null;
+        }
+
+        for (int i = 0; i < values.length; i++) {
+            long timeout = Long.parseLong(values[i].toString());
+            if (currentTimeout == timeout) {
+                return entries[i];
+            }
+        }
+        return null;
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -360,6 +361,12 @@
             mTapToWakePreference.setChecked(value != 0);
         }
 
+        // Update doze if it is available.
+        if (mDozePreference != null) {
+            int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);
+            mDozePreference.setChecked(value != 0);
+        }
+
         // Update camera gesture #1 if it is available.
         if (mCameraGesturePreference != null) {
             int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
@@ -407,6 +414,10 @@
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);
         }
+        if (preference == mDozePreference) {
+            boolean value = (Boolean) objValue;
+            Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
+        }
         if (preference == mTapToWakePreference) {
             boolean value = (Boolean) objValue;
             Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);
@@ -432,7 +443,7 @@
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference == mDozePreference) {
-            MetricsLogger.action(getActivity(), MetricsEvent.ACTION_AMBIENT_DISPLAY);
+            mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_AMBIENT_DISPLAY);
         }
         return super.onPreferenceTreeClick(preference);
     }
@@ -472,11 +483,17 @@
         }
 
         private void updateSummary() {
-            boolean auto = Settings.System.getInt(mContext.getContentResolver(),
-                    SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC)
-                    == SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-            mLoader.setSummary(this, mContext.getString(auto ? R.string.display_summary_on
-                    : R.string.display_summary_off));
+            final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
+                    SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
+            final CharSequence[] entries =
+                    mContext.getResources().getTextArray(R.array.screen_timeout_entries);
+            final CharSequence[] values =
+                    mContext.getResources().getTextArray(R.array.screen_timeout_values);
+            final CharSequence timeoutDescription = getTimeoutDescription(
+                    currentTimeout, entries, values);
+            final String summary = timeoutDescription == null ? ""
+                    : mContext.getString(R.string.display_summary, timeoutDescription);
+            mLoader.setSummary(this, summary);
         }
     }
 

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/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 300f316..9af91cc 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java

@@ -55,6 +55,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.fingerprint.FingerprintSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
@@ -1222,7 +1223,7 @@
         }
     }
 
-    public static class UnificationConfirmationDialog extends DialogFragment {
+    public static class UnificationConfirmationDialog extends InstrumentedDialogFragment {
         private static final String EXTRA_COMPLIANT = "compliant";
 
         public static UnificationConfirmationDialog newIntance(boolean compliant) {
@@ -1272,6 +1273,11 @@
             super.onDismiss(dialog);
             ((SecuritySettings) getParentFragment()).updateUnificationPreference();
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_UNIFICATION_CONFIRMATION;
+        }
     }
 
 }

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 01b0632..559b9ce 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java

@@ -120,6 +120,7 @@
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageDomainUrlsActivity extends SettingsActivity { /* empty */ }
+    public static class AutomaticStorageManagerSettingsActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
     public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 222e6eb..69b86fe 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java

@@ -76,6 +76,7 @@
 import com.android.settings.dashboard.DashboardContainerFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.deviceinfo.ImeiInformation;
 import com.android.settings.deviceinfo.PrivateVolumeForget;
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
@@ -356,6 +357,7 @@
             MasterClear.class.getName(),
             NightDisplaySettings.class.getName(),
             ManageDomainUrls.class.getName(),
+            AutomaticStorageManagerSettings.class.getName()
     };
 
 

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

@@ -46,6 +46,7 @@
 
 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;
@@ -501,10 +502,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 +576,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 +590,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 +598,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/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
index 31042cb..03414bd 100644
--- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java
+++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java

@@ -138,7 +138,7 @@
                     onClickOk();
                 }
             } else if (view == mNegativeButton) {
-                onClickRemove();
+                onClickEnableOrDisable();
             }
         }
 
@@ -155,21 +155,26 @@
             }
         }
 
-        private void onClickRemove() {
+        private void onClickEnableOrDisable() {
             final CertHolder certHolder = getCurrentCertInfo();
-            new AlertDialog.Builder(mActivity)
-                    .setMessage(getButtonConfirmation(certHolder))
-                    .setPositiveButton(android.R.string.yes,
-                            new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int id) {
-                                    mDelegate.removeOrInstallCert(certHolder);
-                                    dialog.dismiss();
-                                    nextOrDismiss();
-                                }
-                            })
-                    .setNegativeButton(android.R.string.no, null)
-                    .show();
+            DialogInterface.OnClickListener onConfirm = new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int id) {
+                    mDelegate.removeOrInstallCert(certHolder);
+                    nextOrDismiss();
+                }
+            };
+            if (certHolder.isSystemCert()) {
+                // Removing system certs is reversible, so skip confirmation.
+                onConfirm.onClick(null, -1);
+            } else {
+                new AlertDialog.Builder(mActivity)
+                        .setMessage(R.string.trusted_credentials_remove_confirmation)
+                        .setPositiveButton(android.R.string.yes, onConfirm)
+                        .setNegativeButton(android.R.string.no, null)
+                        .show();
+
+            }
         }
 
         private void onCredentialConfirmed(int userId) {
@@ -314,13 +319,6 @@
             return certLayout;
         }
 
-        private static int getButtonConfirmation(CertHolder certHolder) {
-            return certHolder.isSystemCert() ? ( certHolder.isDeleted()
-                        ? R.string.trusted_credentials_enable_confirmation
-                        : R.string.trusted_credentials_disable_confirmation )
-                    : R.string.trusted_credentials_remove_confirmation;
-        }
-
         private static int getButtonLabel(CertHolder certHolder) {
             return certHolder.isSystemCert() ? ( certHolder.isDeleted()
                         ? R.string.trusted_credentials_enable_label

diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 4cefc74..bae0a92 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java

@@ -318,7 +318,8 @@
      * whereas children correspond to certificates.
      */
     private class GroupAdapter extends BaseExpandableListAdapter implements
-            ExpandableListView.OnGroupClickListener, ExpandableListView.OnChildClickListener {
+            ExpandableListView.OnGroupClickListener, ExpandableListView.OnChildClickListener,
+            View.OnClickListener {
         private final AdapterData mData;
 
         private GroupAdapter(Tab tab) {
@@ -402,6 +403,16 @@
             return true;
         }
 
+        /**
+         * Called when the switch on a system certificate is clicked. This will toggle whether it
+         * is trusted as a credential.
+         */
+        @Override
+        public void onClick(View view) {
+            CertHolder holder = (CertHolder) view.getTag();
+            removeOrInstallCert(holder);
+        }
+
         @Override
         public boolean onGroupClick(ExpandableListView expandableListView, View view,
                 int groupPosition, long id) {
@@ -459,16 +470,17 @@
                 ViewGroup parent) {
             ViewHolder holder;
             if (convertView == null) {
+                holder = new ViewHolder();
                 LayoutInflater inflater = LayoutInflater.from(getActivity());
                 convertView = inflater.inflate(R.layout.trusted_credential, parent, false);
-                holder = new ViewHolder();
+                convertView.setTag(holder);
                 holder.mSubjectPrimaryView = (TextView)
                         convertView.findViewById(R.id.trusted_credential_subject_primary);
                 holder.mSubjectSecondaryView = (TextView)
                         convertView.findViewById(R.id.trusted_credential_subject_secondary);
                 holder.mSwitch = (Switch) convertView.findViewById(
                         R.id.trusted_credential_status);
-                convertView.setTag(holder);
+                holder.mSwitch.setOnClickListener(this);
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
@@ -480,6 +492,7 @@
                         UserManager.DISALLOW_CONFIG_CREDENTIALS,
                         new UserHandle(certHolder.mProfileId)));
                 holder.mSwitch.setVisibility(View.VISIBLE);
+                holder.mSwitch.setTag(certHolder);
             }
             return convertView;
         }
@@ -576,6 +589,7 @@
             mListView = (ListView) mContainerView.findViewById(R.id.cert_list);
             mListView.setAdapter(this);
             mListView.setOnItemClickListener(this);
+            mListView.setItemsCanFocus(true);
 
             mHeaderView = (ViewGroup) mContainerView.findViewById(R.id.header_view);
             mHeaderView.setOnClickListener(this);

diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index 8a75905..df073d1 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java

@@ -50,6 +50,7 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -108,7 +109,7 @@
         }
     }
 
-    public static class CredentialDialogFragment extends DialogFragment {
+    public static class CredentialDialogFragment extends InstrumentedDialogFragment {
         private static final String TAG = "CredentialDialogFragment";
         private static final String ARG_CREDENTIAL = "credential";
 
@@ -166,6 +167,11 @@
             return builder.create();
         }
 
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_USER_CREDENTIAL;
+        }
+
         /**
          * Deletes all certificates and keys under a given alias.
          *

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/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 8d8f046..f1a2fef 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java

@@ -39,7 +39,6 @@
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.Phone;
 import com.android.settings.widget.SwitchBar;
@@ -335,9 +334,9 @@
         int wfcMode = ImsManager.getWfcMode(context);
         updateButtonWfcMode(context, wfcEnabled, wfcMode);
         if (wfcEnabled) {
-            MetricsLogger.action(getActivity(), getMetricsCategory(), wfcMode);
+            mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), wfcMode);
         } else {
-            MetricsLogger.action(getActivity(), getMetricsCategory(), -1);
+            mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), -1);
         }
     }
 
@@ -390,7 +389,7 @@
             if (buttonMode != currentMode) {
                 ImsManager.setWfcMode(context, buttonMode);
                 mButtonWfcMode.setSummary(getWfcModeSummary(context, buttonMode));
-                MetricsLogger.action(getActivity(), getMetricsCategory(), buttonMode);
+                mMetricsFeatureProvider.action(getActivity(), getMetricsCategory(), buttonMode);
             }
         }
         return true;

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 4017068..b73795f 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java

@@ -202,6 +202,14 @@
         return super.onCreateDialog(dialogId);
     }
 
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) {
+            return MetricsEvent.DIALOG_MANAGE_MOBILE_PLAN;
+        }
+        return 0;
+    }
+
     private void log(String s) {
         Log.d(TAG, s);
     }
@@ -234,7 +242,8 @@
         RestrictedPreference androidBeam = (RestrictedPreference) findPreference(
                 KEY_ANDROID_BEAM_SETTINGS);
 
-        mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
+        mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference,
+                mMetricsFeatureProvider);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
         mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);

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/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
index fec3d37..0b64e96 100644
--- a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java

@@ -16,7 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 
 public class FontSizePreferenceFragmentForSetupWizard
@@ -31,7 +30,7 @@
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
         if (mCurrentIndex != mInitialIndex) {
-            MetricsLogger.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE,
+            mMetricsFeatureProvider.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE,
                     mCurrentIndex);
         }
 

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/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index c424c1e..5798319 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java

@@ -41,7 +41,7 @@
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
         if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) {
-            MetricsLogger.action(getContext(),
+            mMetricsFeatureProvider.action(getContext(),
                     MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION,
                     mToggleSwitch.isChecked());
         }

diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 1ccae03..f96219b 100644
--- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java

@@ -18,7 +18,6 @@
 
 import android.os.Bundle;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 
 public class ToggleScreenReaderPreferenceFragmentForSetupWizard
@@ -41,7 +40,7 @@
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
         if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) {
-            MetricsLogger.action(getContext(),
+            mMetricsFeatureProvider.action(getContext(),
                     MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER, mToggleSwitch.isChecked());
         }
 

diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index d0e200af..e93c7fa 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java

@@ -56,6 +56,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
@@ -625,7 +626,7 @@
         }
     }
 
-    public static class RemoveUserFragment extends DialogFragment {
+    public static class RemoveUserFragment extends InstrumentedDialogFragment {
         private static final String ARG_USER_ID = "userId";
 
         static RemoveUserFragment newInstance(int userId) {
@@ -649,12 +650,17 @@
                         }
                     });
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_REMOVE_USER;
+        }
     }
 
     /**
      * Dialog to inform user about changing auto-sync setting
      */
-    public static class ConfirmAutoSyncChangeFragment extends DialogFragment {
+    public static class ConfirmAutoSyncChangeFragment extends InstrumentedDialogFragment {
         private static final String SAVE_ENABLING = "enabling";
         private static final String SAVE_USER_HANDLE = "userHandle";
         private boolean mEnabling;
@@ -705,6 +711,11 @@
             outState.putBoolean(SAVE_ENABLING, mEnabling);
             outState.putParcelable(SAVE_USER_HANDLE, mUserHandle);
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_CONFIRM_AUTO_SYNC_CHANGE;
+        }
     }
 
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

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/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index f7992cc..138fadf 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java

@@ -37,9 +37,11 @@
 import android.os.UserManager;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -229,11 +231,18 @@
                 new UserHandle(UserHandle.getUserId(uid)));
     }
 
-    public static class MyAlertDialogFragment extends DialogFragment {
+    public static class MyAlertDialogFragment extends InstrumentedDialogFragment {
+
+        private static final String ARG_ID = "id";
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION;
+        }
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
-            int id = getArguments().getInt("id");
+            int id = getArguments().getInt(ARG_ID);
             int errorCode = getArguments().getInt("moveError");
             Dialog dialog = ((AppInfoBase) getTargetFragment()).createDialog(id, errorCode);
             if (dialog == null) {
@@ -245,7 +254,7 @@
         public static MyAlertDialogFragment newInstance(int id, int errorCode) {
             MyAlertDialogFragment dialogFragment = new MyAlertDialogFragment();
             Bundle args = new Bundle();
-            args.putInt("id", id);
+            args.putInt(ARG_ID, id);
             args.putInt("moveError", errorCode);
             dialogFragment.setArguments(args);
             return dialogFragment;

diff --git a/src/com/android/settings/applications/AppStateOverlayBridge.java b/src/com/android/settings/applications/AppStateOverlayBridge.java
index af51984..838ee42 100644
--- a/src/com/android/settings/applications/AppStateOverlayBridge.java
+++ b/src/com/android/settings/applications/AppStateOverlayBridge.java

@@ -23,6 +23,9 @@
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /*
  * Connects info of apps that draw overlay to the ApplicationsState. Wraps around the generic
  * AppStateAppOpsBridge class to tailor to the semantics of SYSTEM_ALERT_WINDOW. Also provides app
@@ -62,6 +65,13 @@
     }
 
     public static class OverlayState extends AppStateAppOpsBridge.PermissionState {
+        public final boolean controlEnabled;
+
+        private static final List<String> DISABLE_PACKAGE_LIST = new ArrayList<>();
+
+        static {
+            DISABLE_PACKAGE_LIST.add("com.android.systemui");
+        }
 
         public OverlayState(PermissionState permissionState) {
             super(permissionState.packageName, permissionState.userHandle);
@@ -69,6 +79,7 @@
             this.appOpMode = permissionState.appOpMode;
             this.permissionDeclared = permissionState.permissionDeclared;
             this.staticPermissionGranted = permissionState.staticPermissionGranted;
+            controlEnabled = !DISABLE_PACKAGE_LIST.contains(permissionState.packageName);
         }
     }
 

diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java
index ade2923..335bb16 100644
--- a/src/com/android/settings/applications/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/DrawOverlayDetails.java

@@ -144,7 +144,7 @@
         boolean isAllowed = mOverlayState.isPermissible();
         mSwitchPref.setChecked(isAllowed);
         // you cannot ask a user to grant you a permission you did not have!
-        mSwitchPref.setEnabled(mOverlayState.permissionDeclared);
+        mSwitchPref.setEnabled(mOverlayState.permissionDeclared && mOverlayState.controlEnabled);
         mOverlayPrefs.setEnabled(isAllowed);
         getPreferenceScreen().removePreference(mOverlayPrefs);
 

diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java
index 2990d53..a16a865 100644
--- a/src/com/android/settings/applications/ManageDomainUrls.java
+++ b/src/com/android/settings/applications/ManageDomainUrls.java

@@ -22,6 +22,7 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.provider.Settings.Global;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -57,9 +58,6 @@
 public class ManageDomainUrls extends SettingsPreferenceFragment
         implements ApplicationsState.Callbacks, OnPreferenceChangeListener {
 
-    // STOPSHIP; b/30256615
-    private static final boolean DISABLE_WEB_ACTIONS = !Build.IS_DEBUGGABLE;
-
     private ApplicationsState mApplicationsState;
     private ApplicationsState.Session mSession;
     private PreferenceGroup mDomainAppList;
@@ -114,7 +112,9 @@
             return;
         }
 
-        if (DISABLE_WEB_ACTIONS) {
+        final boolean disableWebActions = Global.getInt(getContext().getContentResolver(),
+                Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0;
+        if (disableWebActions) {
             mDomainAppList = getPreferenceScreen();
         } else {
             final PreferenceGroup preferenceScreen = getPreferenceScreen();

diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index bfd275f..38b8f37 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java

@@ -36,6 +36,7 @@
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -554,15 +555,15 @@
         }
         return null;
     }
-    
+
     private void showConfirmStopDialog(ComponentName comp) {
         DialogFragment newFragment = MyAlertDialogFragment.newConfirmStop(
                 DIALOG_CONFIRM_STOP, comp);
         newFragment.setTargetFragment(this, 0);
         newFragment.show(getFragmentManager(), "confirmstop");
     }
-    
-    public static class MyAlertDialogFragment extends DialogFragment {
+
+    public static class MyAlertDialogFragment extends InstrumentedDialogFragment {
 
         public static MyAlertDialogFragment newConfirmStop(int id, ComponentName comp) {
             MyAlertDialogFragment frag = new MyAlertDialogFragment();
@@ -605,6 +606,11 @@
             }
             throw new IllegalArgumentException("unknown id " + id);
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_RUNNIGN_SERVICE;
+        }
     }
 
     void ensureData() {

diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index d9de56d..18e3ed0 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java

@@ -24,13 +24,12 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.util.Log;
 import android.widget.Switch;
 import android.widget.Toast;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.search.Index;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.WirelessUtils;
@@ -43,9 +42,10 @@
  * preference reflects the current state.
  */
 public final class BluetoothEnabler implements SwitchBar.OnSwitchChangeListener {
+    private final Switch mSwitch;
+    private final SwitchBar mSwitchBar;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
     private Context mContext;
-    private Switch mSwitch;
-    private SwitchBar mSwitchBar;
     private boolean mValidListener;
     private final LocalBluetoothAdapter mLocalAdapter;
     private final IntentFilter mIntentFilter;
@@ -76,8 +76,10 @@
         }
     };
 
-    public BluetoothEnabler(Context context, SwitchBar switchBar) {
+    public BluetoothEnabler(Context context, SwitchBar switchBar,
+            MetricsFeatureProvider metricsFeatureProvider) {
         mContext = context;
+        mMetricsFeatureProvider = metricsFeatureProvider;
         mSwitchBar = switchBar;
         mSwitch = switchBar.getSwitch();
         mValidListener = false;
@@ -187,7 +189,7 @@
             switchView.setChecked(false);
         }
 
-        MetricsLogger.action(mContext, MetricsEvent.ACTION_BLUETOOTH_TOGGLE, isChecked);
+        mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_BLUETOOTH_TOGGLE, isChecked);
 
         if (mLocalAdapter != null) {
             boolean status = mLocalAdapter.setBluetoothEnabled(isChecked);

diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 293a53e..1ee068f 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java

@@ -40,14 +40,17 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * Dialog fragment for renaming the local Bluetooth device.
  */
-public final class BluetoothNameDialogFragment extends DialogFragment implements TextWatcher {
+public final class BluetoothNameDialogFragment extends InstrumentedDialogFragment
+        implements TextWatcher {
     private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 248;
 
     private AlertDialog mAlertDialog;
@@ -88,6 +91,11 @@
     }
 
     @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_RENAME;
+    }
+
+    @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         String deviceName = mLocalAdapter.getName();
         if (savedInstanceState != null) {

diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 99a2700..3dfcfc7 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java

@@ -40,7 +40,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-import com.android.internal.logging.MetricsLogger;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
@@ -146,7 +146,7 @@
         final SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
 
-        mBluetoothEnabler = new BluetoothEnabler(activity, mSwitchBar);
+        mBluetoothEnabler = new BluetoothEnabler(activity, mSwitchBar, mMetricsFeatureProvider);
         mBluetoothEnabler.setupSwitchBar();
     }
 
@@ -248,19 +248,22 @@
         switch (item.getItemId()) {
             case MENU_ID_SCAN:
                 if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
-                    MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_SCAN);
+                    mMetricsFeatureProvider.action(getActivity(),
+                            MetricsEvent.ACTION_BLUETOOTH_SCAN);
                     startScanning();
                 }
                 return true;
 
             case MENU_ID_RENAME_DEVICE:
-                MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_RENAME);
+                mMetricsFeatureProvider.action(getActivity(),
+                        MetricsEvent.ACTION_BLUETOOTH_RENAME);
                 new BluetoothNameDialogFragment().show(
                         getFragmentManager(), "rename device");
                 return true;
 
             case MENU_ID_SHOW_RECEIVED:
-                MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_FILES);
+                mMetricsFeatureProvider.action(getActivity(),
+                        MetricsEvent.ACTION_BLUETOOTH_FILES);
                 Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
                 getActivity().sendBroadcast(intent);
                 return true;

diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index ca4d4f5..f9b507d 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java

@@ -24,8 +24,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.EditTextPreference;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
@@ -37,7 +35,9 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -47,9 +47,7 @@
 import com.android.settingslib.bluetooth.PanProfile;
 import com.android.settingslib.bluetooth.PbapServerProfile;
 
-import java.util.HashMap;
-
-public final class DeviceProfilesSettings extends DialogFragment implements
+public final class DeviceProfilesSettings extends InstrumentedDialogFragment implements
         CachedBluetoothDevice.Callback, DialogInterface.OnClickListener, OnClickListener {
     private static final String TAG = "DeviceProfilesSettings";
 
@@ -65,10 +63,6 @@
 
     private ViewGroup mProfileContainer;
     private TextView mProfileLabel;
-    private EditTextPreference mDeviceNamePref;
-
-    private final HashMap<LocalBluetoothProfile, CheckBoxPreference> mAutoConnectPrefs
-            = new HashMap<LocalBluetoothProfile, CheckBoxPreference>();
 
     private AlertDialog mDisconnectDialog;
     private boolean mProfileGroupIsRemoved;
@@ -76,6 +70,11 @@
     private View mRootView;
 
     @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_PROFILE;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -103,7 +102,7 @@
         deviceName.setText(mCachedDevice.getName(), TextView.BufferType.EDITABLE);
         return new AlertDialog.Builder(getContext())
                 .setView(mRootView)
-                .setNegativeButton(R.string.forget, this)
+                .setNeutralButton(R.string.forget, this)
                 .setPositiveButton(R.string.okay, this)
                 .setTitle(R.string.bluetooth_preference_paired_devices)
                 .create();

diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 7fa9fc5..e50eae3 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java

@@ -16,11 +16,14 @@
 
 package com.android.settings.core;
 
+import android.content.Context;
 import android.os.Bundle;
 
 import com.android.settings.core.instrumentation.Instrumentable;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
+import com.android.settings.overlay.FeatureFactory;
 
 /**
  * Instrumented fragment that logs visibility state.
@@ -28,12 +31,20 @@
 public abstract class InstrumentedFragment extends ObservablePreferenceFragment
         implements Instrumentable {
 
+    protected MetricsFeatureProvider mMetricsFeatureProvider;
+
     public InstrumentedFragment() {
         // Mixin that logs visibility change for activity.
         getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory()));
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+    }
+
+    @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
     }
 }

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

@@ -15,13 +15,36 @@
  */
 package com.android.settings.core.instrumentation;
 
+import android.content.Context;
+
+import com.android.settings.DialogCreatable;
 import com.android.settings.core.lifecycle.ObservableDialogFragment;
+import com.android.settings.overlay.FeatureFactory;
 
 public abstract class InstrumentedDialogFragment extends ObservableDialogFragment
         implements Instrumentable {
 
+    protected final DialogCreatable mDialogCreatable;
+    protected int mDialogId;
+    protected MetricsFeatureProvider mMetricsFeatureProvider;
+
     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()));
     }
 
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+    }
 }

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/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index ca68a74..cc65357 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java

@@ -33,11 +33,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.conditional.Condition;
 import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
 import com.android.settingslib.SuggestionParser;
@@ -71,6 +71,7 @@
     private final IconCache mCache;
 
     private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private List<DashboardCategory> mCategories;
     private List<Condition> mConditions;
@@ -85,9 +86,11 @@
     private Condition mExpandedCondition = null;
     private SuggestionParser mSuggestionParser;
 
-    public DashboardAdapter(Context context, SuggestionParser parser, Bundle savedInstanceState,
-                List<Condition> conditions) {
+    public DashboardAdapter(Context context, SuggestionParser parser,
+            MetricsFeatureProvider metricsFeatureProvider, Bundle savedInstanceState,
+            List<Condition> conditions) {
         mContext = context;
+        mMetricsFeatureProvider = metricsFeatureProvider;
         mCache = new IconCache(context);
         mSuggestionParser = parser;
         mConditions = conditions;
@@ -240,7 +243,8 @@
                 holder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_SUGGESTION,
+                        mMetricsFeatureProvider.action(mContext,
+                                MetricsEvent.ACTION_SETTINGS_SUGGESTION,
                                 DashboardAdapter.getSuggestionIdentifier(mContext, suggestion));
                         ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
                     }
@@ -276,7 +280,8 @@
                 new MenuItem.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
+                mMetricsFeatureProvider.action(
+                        mContext, MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION,
                         DashboardAdapter.getSuggestionIdentifier(mContext, suggestion));
                 disableSuggestion(suggestion);
                 mSuggestions.remove(suggestion);
@@ -379,12 +384,12 @@
             return;
         }
         if (v.getTag() == mExpandedCondition) {
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
                     mExpandedCondition.getMetricsConstant());
             mExpandedCondition.onPrimaryClick();
         } else {
             mExpandedCondition = (Condition) v.getTag();
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
                     mExpandedCondition.getMetricsConstant());
             notifyDataSetChanged();
         }
@@ -392,12 +397,13 @@
 
     public void onExpandClick(View v) {
         if (v.getTag() == mExpandedCondition) {
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_COLLAPSE,
+            mMetricsFeatureProvider.action(mContext,
+                    MetricsEvent.ACTION_SETTINGS_CONDITION_COLLAPSE,
                     mExpandedCondition.getMetricsConstant());
             mExpandedCondition = null;
         } else {
             mExpandedCondition = (Condition) v.getTag();
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
                     mExpandedCondition.getMetricsConstant());
         }
         notifyDataSetChanged();

diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java
index 2b5e67e..3477d90 100644
--- a/src/com/android/settings/dashboard/DashboardContainerFragment.java
+++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java

@@ -27,11 +27,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
 import com.android.settings.widget.RtlCompatibleViewPager;
@@ -73,7 +73,7 @@
                 getChildFragmentManager(), mViewPager);
         mViewPager.setAdapter(mPagerAdapter);
         mViewPager.addOnPageChangeListener(
-                new TabChangeListener((SettingsActivity) getActivity()));
+                new TabChangeListener((SettingsActivity) getActivity(), mMetricsFeatureProvider));
 
         // check if support tab needs to be selected
         final String selectedTab = getArguments().
@@ -157,9 +157,12 @@
             implements RtlCompatibleViewPager.OnPageChangeListener {
 
         private final SettingsActivity mActivity;
+        private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-        public TabChangeListener(SettingsActivity activity) {
+        public TabChangeListener(SettingsActivity activity,
+                MetricsFeatureProvider metricsFeatureProvider) {
             mActivity = activity;
+            mMetricsFeatureProvider = metricsFeatureProvider;
         }
 
         @Override
@@ -176,12 +179,12 @@
         public void onPageSelected(int position) {
             switch (position) {
                 case INDEX_SUMMARY_FRAGMENT:
-                    MetricsLogger.action(
+                    mMetricsFeatureProvider.action(
                             mActivity, MetricsProto.MetricsEvent.ACTION_SELECT_SUMMARY);
                     mActivity.setDisplaySearchMenu(true);
                     break;
                 case INDEX_SUPPORT_FRAGMENT:
-                    MetricsLogger.action(
+                    mMetricsFeatureProvider.action(
                             mActivity, MetricsProto.MetricsEvent.ACTION_SELECT_SUPPORT_FRAGMENT);
                     mActivity.setDisplaySearchMenu(false);
                     break;

diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index b54521c..fb8c959 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java

@@ -26,12 +26,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.dashboard.conditional.Condition;
 import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
 import com.android.settings.dashboard.conditional.ConditionManager;
@@ -122,7 +121,7 @@
         mSummaryLoader.setListening(true);
         for (Condition c : mConditionManager.getConditions()) {
             if (c.shouldShow()) {
-                MetricsLogger.visible(getContext(), c.getMetricsConstant());
+                mMetricsFeatureProvider.visible(getContext(), c.getMetricsConstant());
             }
         }
         if (DEBUG_TIMING) Log.d(TAG, "onResume took " + (System.currentTimeMillis() - startTime)
@@ -137,7 +136,7 @@
         mSummaryLoader.setListening(false);
         for (Condition c : mConditionManager.getConditions()) {
             if (c.shouldShow()) {
-                MetricsLogger.hidden(getContext(), c.getMetricsConstant());
+                mMetricsFeatureProvider.hidden(getContext(), c.getMetricsConstant());
             }
         }
         if (mAdapter.getSuggestions() == null) {
@@ -148,7 +147,7 @@
                 String id = DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion);
                 if (!mSuggestionsHiddenLogged.contains(id)) {
                     mSuggestionsHiddenLogged.add(id);
-                    MetricsLogger.action(getContext(),
+                    mMetricsFeatureProvider.action(getContext(),
                             MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION, id);
                 }
             }
@@ -200,8 +199,8 @@
         mDashboard.setHasFixedSize(true);
         mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
         mDashboard.setListener(this);
-        mAdapter = new DashboardAdapter(getContext(), mSuggestionParser, bundle,
-                mConditionManager.getConditions());
+        mAdapter = new DashboardAdapter(getContext(), mSuggestionParser, mMetricsFeatureProvider,
+                bundle, mConditionManager.getConditions());
         mDashboard.setAdapter(mAdapter);
         mSummaryLoader.setAdapter(mAdapter);
         ConditionAdapterUtils.addDismiss(mDashboard);
@@ -246,7 +245,7 @@
                     String id = DashboardAdapter.getSuggestionIdentifier(context, suggestion);
                     if (!mSuggestionsShownLogged.contains(id)) {
                         mSuggestionsShownLogged.add(id);
-                        MetricsLogger.action(context,
+                        mMetricsFeatureProvider.action(context,
                                 MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
                     }
                 }

diff --git a/src/com/android/settings/dashboard/NoHomeDialogFragment.java b/src/com/android/settings/dashboard/NoHomeDialogFragment.java
index 0bc1705..b8ea9ea 100644
--- a/src/com/android/settings/dashboard/NoHomeDialogFragment.java
+++ b/src/com/android/settings/dashboard/NoHomeDialogFragment.java

@@ -22,9 +22,11 @@
 import android.app.DialogFragment;
 import android.os.Bundle;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-public class NoHomeDialogFragment extends DialogFragment {
+public class NoHomeDialogFragment extends InstrumentedDialogFragment {
     public static void show(Activity parent) {
         final NoHomeDialogFragment dialog = new NoHomeDialogFragment();
         dialog.show(parent.getFragmentManager(), null);
@@ -37,4 +39,9 @@
                 .setPositiveButton(android.R.string.ok, null)
                 .create();
     }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_NO_HOME;
+    }
 }

diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 087ecad..bd9948b 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java

@@ -37,12 +37,11 @@
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.search.Index;
 
 import java.util.HashMap;
@@ -85,8 +84,8 @@
         @Override
         protected void onPostExecute(Cursor cursor) {
             if (!isCancelled()) {
-                MetricsLogger.action(getContext(), MetricsEvent.ACTION_SEARCH_RESULTS,
-                        cursor.getCount());
+                mMetricsFeatureProvider.action(getContext(),
+                        MetricsEvent.ACTION_SEARCH_RESULTS, cursor.getCount());
                 setResultsCursor(cursor);
                 setResultsVisibility(cursor.getCount() > 0);
             } else if (cursor != null) {

diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java
index 9773a50..c8fed8a 100644
--- a/src/com/android/settings/dashboard/SupportFragment.java
+++ b/src/com/android/settings/dashboard/SupportFragment.java

@@ -36,8 +36,8 @@
 import android.view.ViewGroup;
 
 import com.android.internal.logging.MetricsProto;
-import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.R;
+import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
 
@@ -89,7 +89,7 @@
         mSupportFeatureProvider =
                 FeatureFactory.getFactory(mActivity).getSupportFeatureProvider(mActivity);
         mSupportItemAdapter = new SupportItemAdapter(mActivity, savedInstanceState,
-                mSupportFeatureProvider, this /* itemClickListener */);
+                mSupportFeatureProvider, mMetricsFeatureProvider, this /* itemClickListener */);
         mConnectivityManager =
                 (ConnectivityManager) mActivity.getSystemService(Context.CONNECTIVITY_SERVICE);
     }

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 9ef69883..f966668 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java

@@ -37,9 +37,9 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.SupportFeatureProvider;
 import com.android.settings.support.SupportDisclaimerDialogFragment;
 import com.android.settings.support.SupportPhone;
@@ -69,6 +69,7 @@
     private final EscalationClickListener mEscalationClickListener;
     private final SpinnerItemSelectListener mSpinnerItemSelectListener;
     private final SupportFeatureProvider mSupportFeatureProvider;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final View.OnClickListener mItemClickListener;
     private final List<SupportData> mSupportData;
 
@@ -77,9 +78,12 @@
     private Account mAccount;
 
     public SupportItemAdapter(Activity activity, Bundle savedInstanceState,
-            SupportFeatureProvider supportFeatureProvider, View.OnClickListener itemClickListener) {
+            SupportFeatureProvider supportFeatureProvider,
+            MetricsFeatureProvider metricsFeatureProvider,
+            View.OnClickListener itemClickListener) {
         mActivity = activity;
         mSupportFeatureProvider = supportFeatureProvider;
+        mMetricsFeatureProvider = metricsFeatureProvider;
         mItemClickListener = itemClickListener;
         mEscalationClickListener = new EscalationClickListener();
         mSpinnerItemSelectListener = new SpinnerItemSelectListener();
@@ -141,7 +145,7 @@
             if (data.intent != null &&
                     mActivity.getPackageManager().resolveActivity(data.intent, 0) != null) {
                 if (data.metricsEvent >= 0) {
-                    MetricsLogger.action(mActivity, data.metricsEvent);
+                    mMetricsFeatureProvider.action(mActivity, data.metricsEvent);
                 }
                 mActivity.startActivityForResult(data.intent, 0);
             }
@@ -427,7 +431,7 @@
             if (mAccount == null) {
                 switch (v.getId()) {
                     case android.R.id.text1:
-                        MetricsLogger.action(mActivity,
+                        mMetricsFeatureProvider.action(mActivity,
                                 MetricsProto.MetricsEvent.ACTION_SUPPORT_SIGN_IN);
                         mActivity.startActivityForResult(
                                 mSupportFeatureProvider.getAccountLoginIntent(),
@@ -442,12 +446,12 @@
             } else if (mHasInternet) {
                 switch (v.getId()) {
                     case android.R.id.text1:
-                        MetricsLogger.action(mActivity,
+                        mMetricsFeatureProvider.action(mActivity,
                                 MetricsProto.MetricsEvent.ACTION_SUPPORT_PHONE);
                         tryStartDisclaimerAndSupport(PHONE);
                         break;
                     case android.R.id.text2:
-                        MetricsLogger.action(mActivity,
+                        mMetricsFeatureProvider.action(mActivity,
                                 MetricsProto.MetricsEvent.ACTION_SUPPORT_CHAT);
                         tryStartDisclaimerAndSupport(CHAT);
                         break;
@@ -463,7 +467,7 @@
                                     .queryIntentActivities(intent, 0)
                                     .isEmpty();
                             if (canDial) {
-                                MetricsLogger.action(mActivity,
+                                mMetricsFeatureProvider.action(mActivity,
                                         MetricsProto.MetricsEvent.ACTION_SUPPORT_DAIL_TOLLFREE);
                                 mActivity.startActivity(intent);
                             }
@@ -475,7 +479,7 @@
                                 .getSupportPhones(mSelectedCountry, false /* isTollFree */);
                         final SupportPhoneDialogFragment fragment =
                                 SupportPhoneDialogFragment.newInstance(phone);
-                        MetricsLogger.action(mActivity,
+                        mMetricsFeatureProvider.action(mActivity,
                                 MetricsProto.MetricsEvent.ACTION_SUPPORT_VIEW_TRAVEL_ABROAD_DIALOG);
                         fragment.show(mActivity.getFragmentManager(),
                                 SupportPhoneDialogFragment.TAG);

diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java
index 0454fe8..61889be 100644
--- a/src/com/android/settings/dashboard/conditional/Condition.java
+++ b/src/com/android/settings/dashboard/conditional/Condition.java

@@ -17,11 +17,14 @@
 package com.android.settings.dashboard.conditional;
 
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Icon;
 import android.os.PersistableBundle;
-import com.android.internal.logging.MetricsLogger;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
 
 import static android.content.pm.PackageManager.DONT_KILL_APP;
 
@@ -32,6 +35,7 @@
     private static final String KEY_LAST_STATE = "last_state";
 
     protected final ConditionManager mManager;
+    protected final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private boolean mIsSilenced;
     private boolean mIsActive;
@@ -39,7 +43,12 @@
 
     // All conditions must live in this package.
     Condition(ConditionManager manager) {
+       this(manager, FeatureFactory.getFactory(manager.getContext()).getMetricsFeatureProvider());
+    }
+
+    Condition(ConditionManager manager, MetricsFeatureProvider metricsFeatureProvider) {
         mManager = manager;
+        mMetricsFeatureProvider = metricsFeatureProvider;
         Class<?> receiverClass = getReceiverClass();
         if (receiverClass != null && shouldAlwaysListenToBroadcast()) {
             PackageManager pm = mManager.getContext().getPackageManager();
@@ -93,8 +102,9 @@
     public void silence() {
         if (!mIsSilenced) {
             mIsSilenced = true;
-            MetricsLogger.action(mManager.getContext(),
-                    MetricsEvent.ACTION_SETTINGS_CONDITION_DISMISS, getMetricsConstant());
+            Context context = mManager.getContext();
+            mMetricsFeatureProvider.action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_DISMISS,
+                    getMetricsConstant());
             onSilenceChanged(mIsSilenced);
             notifyChanged();
         }

diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
index a16de50..0c16527 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java

@@ -18,6 +18,7 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.View;
@@ -25,10 +26,11 @@
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.ImageView;
-import com.android.internal.logging.MetricsLogger;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardAdapter;
+import com.android.settings.overlay.FeatureFactory;
 
 public class ConditionAdapterUtils {
 
@@ -94,9 +96,10 @@
                     button.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            MetricsLogger.action(v.getContext(),
-                                    MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
-                                    condition.getMetricsConstant());
+                            Context context = v.getContext();
+                            FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+                                    .action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
+                                            condition.getMetricsConstant());
                             condition.onActionClick(index);
                         }
                     });

diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java
index dcab279..49d67c2 100644
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ b/src/com/android/settings/dashboard/conditional/DndCondition.java

@@ -139,8 +139,11 @@
         public void onReceive(Context context, Intent intent) {
             if (NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL
                     .equals(intent.getAction())) {
-                ConditionManager.get(context).getCondition(DndCondition.class)
-                        .refreshState();
+                final Condition condition =
+                        ConditionManager.get(context).getCondition(DndCondition.class);
+                if (condition != null) {
+                    condition.refreshState();
+                }
             }
         }
     }

diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 7665bf4..deadc54 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java

@@ -37,6 +37,7 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.DataUsageController;
 
@@ -191,7 +192,7 @@
     /**
      * Dialog to edit {@link NetworkPolicy#warningBytes}.
      */
-    public static class BytesEditorFragment extends DialogFragment
+    public static class BytesEditorFragment extends InstrumentedDialogFragment
             implements DialogInterface.OnClickListener {
         private static final String EXTRA_TEMPLATE = "template";
         private static final String EXTRA_LIMIT = "limit";
@@ -291,12 +292,17 @@
             }
             target.updateDataUsage();
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_BILLING_BYTE_LIMIT;
+        }
     }
 
     /**
      * Dialog to edit {@link NetworkPolicy#cycleDay}.
      */
-    public static class CycleEditorFragment extends DialogFragment implements
+    public static class CycleEditorFragment extends InstrumentedDialogFragment implements
             DialogInterface.OnClickListener {
         private static final String EXTRA_TEMPLATE = "template";
         private NumberPicker mCycleDayPicker;
@@ -314,6 +320,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_BILLING_CYCLE;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
             final DataUsageEditController target = (DataUsageEditController) getTargetFragment();
@@ -359,7 +370,7 @@
      * Dialog to request user confirmation before setting
      * {@link NetworkPolicy#limitBytes}.
      */
-    public static class ConfirmLimitFragment extends DialogFragment implements
+    public static class ConfirmLimitFragment extends InstrumentedDialogFragment implements
             DialogInterface.OnClickListener {
         private static final String EXTRA_MESSAGE = "message";
         private static final String EXTRA_LIMIT_BYTES = "limitBytes";
@@ -392,6 +403,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_BILLING_CONFIRM_LIMIT;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
 

diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java
index b6daa4a..aa4001d 100644
--- a/src/com/android/settings/datausage/CellDataPreference.java
+++ b/src/com/android/settings/datausage/CellDataPreference.java

@@ -33,11 +33,12 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.Checkable;
-import com.android.internal.logging.MetricsLogger;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.CustomDialogPreference;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.overlay.FeatureFactory;
 
 import java.util.List;
 
@@ -110,7 +111,9 @@
 
     @Override
     protected void performClick(View view) {
-        MetricsLogger.action(getContext(), MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);
+        final Context context = getContext();
+        FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+                .action(context, MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);
         if (mChecked) {
             final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
                     mSubId);

diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 977f0a0..3b3ff9c 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java

@@ -19,12 +19,11 @@
 import android.net.NetworkPolicyManager;
 import android.os.Handler;
 import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.util.Log;
 import android.util.SparseIntArray;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
 
 import java.util.ArrayList;
 
@@ -37,6 +36,7 @@
     private static final String TAG = "DataSaverBackend";
 
     private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private final Handler mHandler = new Handler();
     private final NetworkPolicyManager mPolicyManager;
@@ -48,6 +48,7 @@
     // TODO: Staticize into only one.
     public DataSaverBackend(Context context) {
         mContext = context;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
         mPolicyManager = NetworkPolicyManager.from(context);
     }
 
@@ -72,7 +73,8 @@
 
     public void setDataSaverEnabled(boolean enabled) {
         mPolicyManager.setRestrictBackground(enabled);
-        MetricsLogger.action(mContext, MetricsEvent.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
+        mMetricsFeatureProvider.action(
+                mContext, MetricsEvent.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
     }
 
     public void refreshWhitelist() {
@@ -84,7 +86,8 @@
         mPolicyManager.setUidPolicy(uid, policy);
         mUidPolicies.put(uid, policy);
         if (whitelisted) {
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_DATA_SAVER_WHITELIST, packageName);
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_DATA_SAVER_WHITELIST, packageName);
         }
     }
 
@@ -122,7 +125,8 @@
         mPolicyManager.setUidPolicy(uid, policy);
         mUidPolicies.put(uid, policy);
         if (blacklisted) {
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_DATA_SAVER_BLACKLIST, packageName);
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_DATA_SAVER_BLACKLIST, packageName);
         }
     }
 

diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index 2977eea..df238b9 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java

@@ -17,6 +17,8 @@
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
@@ -26,11 +28,8 @@
 import android.view.View;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.AppHeader;
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.AppStateBaseBridge;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
@@ -162,6 +161,9 @@
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
             AppEntry entry = apps.get(i);
+            if (!shouldAddPreference(entry)) {
+                continue;
+            }
             String key = entry.info.packageName + "|" + entry.info.uid;
             AccessPreference preference = (AccessPreference) getCachedPreference(key);
             if (preference == null) {
@@ -221,6 +223,11 @@
         return false;
     }
 
+    @VisibleForTesting
+    boolean shouldAddPreference(AppEntry app) {
+        return app != null && UserHandle.isApp(app.info.uid);
+    }
+
     private class AccessPreference extends SwitchPreference implements DataSaverBackend.Listener {
         private final AppEntry mEntry;
         private final DataUsageState mState;

diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index 0946f31..6177ab4 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java

@@ -18,30 +18,20 @@
 
 import android.app.Activity;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.storage.StorageManager;
 import android.provider.Settings;
-import android.text.format.DateUtils;
-import android.text.format.Formatter;
-import android.util.Log;
-import android.view.View;
-import android.widget.Switch;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceScreen;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.R;
-import com.android.settings.widget.SwitchBar;
-import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
+import com.android.settings.SettingsPreferenceFragment;
 
 /**
  * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the
@@ -142,8 +132,8 @@
         switch (preference.getKey()) {
             case KEY_STORAGE_MANAGER_SWITCH:
                 boolean storageManagerChecked = (boolean) newValue;
-                MetricsLogger.action(getContext(), MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER,
-                        storageManagerChecked);
+                mMetricsFeatureProvider.action(getContext(),
+                        MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, storageManagerChecked);
                 mDaysToRetain.setEnabled(storageManagerChecked);
                 Settings.Secure.putInt(getContentResolver(),
                         Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,

diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
index 2d408de..d7a57ca 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java

@@ -36,6 +36,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 public class PrivateVolumeForget extends SettingsPreferenceFragment {
     private static final String TAG_FORGET_CONFIRM = "forget_confirm";
@@ -72,7 +73,13 @@
         }
     };
 
-    public static class ForgetConfirmFragment extends DialogFragment {
+    public static class ForgetConfirmFragment extends InstrumentedDialogFragment {
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_VOLUME_FORGET;
+        }
+
         public static void show(Fragment parent, String fsUuid) {
             final Bundle args = new Bundle();
             args.putString(VolumeRecord.EXTRA_FS_UUID, fsUuid);

diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 428e472..e148638 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

@@ -30,7 +30,6 @@
 import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.StorageEventListener;
@@ -60,6 +59,7 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.applications.ManageApplications;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.deviceinfo.StorageSettings.MountTask;
 import com.android.settingslib.deviceinfo.StorageMeasurement;
@@ -93,8 +93,6 @@
 
     private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
 
-    private static final String STORAGE_MANAGER_PROPERTY = "ro.storage_manager.enabled";
-
     private static final int[] ITEMS_NO_SHOW_SHARED = new int[] {
             R.string.storage_detail_apps,
             R.string.storage_detail_system,
@@ -218,7 +216,7 @@
 
         screen.removeAll();
 
-        if (SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {
+        if (getResources().getBoolean(R.bool.config_storage_manager_settings_enabled)) {
             addPreference(screen, mAutomaticStorageManagement);
         }
         addPreference(screen, mSummary);
@@ -410,7 +408,8 @@
             mount.setVisible(false);
             unmount.setVisible(false);
             format.setVisible(false);
-            manage.setVisible(SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false));
+            manage.setVisible(getResources().getBoolean(
+                    R.bool.config_storage_manager_settings_enabled));
         } else {
             rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
             mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);
@@ -705,7 +704,7 @@
     /**
      * Dialog that allows editing of volume nickname.
      */
-    public static class RenameFragment extends DialogFragment {
+    public static class RenameFragment extends InstrumentedDialogFragment {
         public static void show(PrivateVolumeSettings parent, VolumeInfo vol) {
             if (!parent.isAdded()) return;
 
@@ -718,6 +717,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_VOLUME_RENAME;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
             final StorageManager storageManager = context.getSystemService(StorageManager.class);
@@ -751,7 +755,7 @@
         }
     }
 
-    public static class SystemInfoFragment extends DialogFragment {
+    public static class SystemInfoFragment extends InstrumentedDialogFragment {
         public static void show(Fragment parent) {
             if (!parent.isAdded()) return;
 
@@ -761,6 +765,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_STORAGE_SYSTEM_INFO;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new AlertDialog.Builder(getActivity())
                     .setMessage(R.string.storage_detail_dialog_system)
@@ -769,7 +778,7 @@
         }
     }
 
-    public static class OtherInfoFragment extends DialogFragment {
+    public static class OtherInfoFragment extends InstrumentedDialogFragment {
         public static void show(Fragment parent, String title, VolumeInfo sharedVol) {
             if (!parent.isAdded()) return;
 
@@ -783,6 +792,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_STORAGE_OTHER_INFO;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
 
@@ -806,7 +820,7 @@
         }
     }
 
-    public static class UserInfoFragment extends DialogFragment {
+    public static class UserInfoFragment extends InstrumentedDialogFragment {
         public static void show(Fragment parent, CharSequence userLabel, CharSequence userSize) {
             if (!parent.isAdded()) return;
 
@@ -820,6 +834,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_STORAGE_USER_INFO;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
 
@@ -839,7 +858,7 @@
     /**
      * Dialog to request user confirmation before clearing all cache data.
      */
-    public static class ConfirmClearCacheFragment extends DialogFragment {
+    public static class ConfirmClearCacheFragment extends InstrumentedDialogFragment {
         public static void show(Fragment parent) {
             if (!parent.isAdded()) return;
 
@@ -849,6 +868,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_STORAGE_CLEAR_CACHE;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
 

diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 1dd8752..d9e02e8 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;
@@ -47,6 +48,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -386,7 +388,7 @@
         }
     }
 
-    public static class VolumeUnmountedFragment extends DialogFragment {
+    public static class VolumeUnmountedFragment extends InstrumentedDialogFragment {
         public static void show(Fragment parent, String volumeId) {
             final Bundle args = new Bundle();
             args.putString(VolumeInfo.EXTRA_VOLUME_ID, volumeId);
@@ -398,6 +400,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_VOLUME_UNMOUNT;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
             final StorageManager sm = context.getSystemService(StorageManager.class);
@@ -411,18 +418,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();
                 }
             });
@@ -432,7 +458,12 @@
         }
     }
 
-    public static class DiskInitFragment extends DialogFragment {
+    public static class DiskInitFragment extends InstrumentedDialogFragment {
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_VOLUME_INIT;
+        }
+
         public static void show(Fragment parent, int resId, String diskId) {
             final Bundle args = new Bundle();
             args.putInt(Intent.EXTRA_TEXT, resId);

diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
index b44bc33..bf33487 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java

@@ -33,7 +33,9 @@
 import android.view.View;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.util.Objects;
 
@@ -168,7 +170,13 @@
         }
     }
 
-    public static class SlowWarningFragment extends DialogFragment {
+    public static class SlowWarningFragment extends InstrumentedDialogFragment {
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_VOLUME_SLOW_WARNING;
+        }
+
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();

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/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
index aa223fa..bfe4a77 100644
--- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java

@@ -16,7 +16,6 @@
 
 package com.android.settings.display;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 
 public class ScreenZoomPreferenceFragmentForSetupWizard
@@ -31,8 +30,8 @@
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
         if (mCurrentIndex != mInitialIndex) {
-            MetricsLogger.action(getContext(), MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE,
-                    mCurrentIndex);
+            mMetricsFeatureProvider.action(
+                    getContext(), MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE, mCurrentIndex);
         }
 
         super.onStop();

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index adc7a99..cd56458 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java

@@ -44,6 +44,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 /**
  * Activity which handles the actual enrolling for fingerprint.
@@ -427,7 +428,7 @@
         return MetricsEvent.FINGERPRINT_ENROLLING;
     }
 
-    public static class IconTouchDialog extends DialogFragment {
+    public static class IconTouchDialog extends InstrumentedDialogFragment {
 
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -443,9 +444,14 @@
                             });
             return builder.create();
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_FINGERPRINT_ICON_TOUCH;
+        }
     }
 
-    public static class ErrorDialog extends DialogFragment {
+    public static class ErrorDialog extends InstrumentedDialogFragment {
 
         /**
          * Create a new instance of ErrorDialog.
@@ -488,5 +494,10 @@
             dialog.setCanceledOnTouchOutside(false);
             return dialog;
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_FINGERPINT_ERROR;
+        }
     }
 }

diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 980bf0b..b044ce3 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java

@@ -21,7 +21,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -40,8 +39,8 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.PreferenceViewHolder;
@@ -60,15 +59,15 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settingslib.HelpUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
@@ -562,7 +561,7 @@
             }
         };
 
-        public static class RenameDeleteDialog extends DialogFragment {
+        public static class RenameDeleteDialog extends InstrumentedDialogFragment {
 
             private Fingerprint mFp;
             private EditText mDialogTextField;
@@ -593,7 +592,7 @@
                                             if (DEBUG) {
                                                 Log.v(TAG, "rename " + name + " to " + newName);
                                             }
-                                            MetricsLogger.action(getContext(),
+                                            mMetricsFeatureProvider.action(getContext(),
                                                     MetricsEvent.ACTION_FINGERPRINT_RENAME,
                                                     mFp.getFingerId());
                                             FingerprintSettingsFragment parent
@@ -638,7 +637,7 @@
 
             private void onDeleteClick(DialogInterface dialog) {
                 if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId());
-                MetricsLogger.action(getContext(), MetricsEvent.ACTION_FINGERPRINT_DELETE,
+                mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_FINGERPRINT_DELETE,
                         mFp.getFingerId());
                 FingerprintSettingsFragment parent
                         = (FingerprintSettingsFragment) getTargetFragment();
@@ -669,13 +668,23 @@
                     outState.putInt("endSelection", mDialogTextField.getSelectionEnd());
                 }
             }
+
+            @Override
+            public int getMetricsCategory() {
+                return MetricsEvent.DIALOG_FINGERPINT_EDIT;
+            }
         }
 
-        public static class ConfirmLastDeleteDialog extends DialogFragment {
+        public static class ConfirmLastDeleteDialog extends InstrumentedDialogFragment {
 
             private Fingerprint mFp;
 
             @Override
+            public int getMetricsCategory() {
+                return MetricsEvent.DIALOG_FINGERPINT_DELETE_LAST;
+            }
+
+            @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 mFp = getArguments().getParcelable("fingerprint");
                 final boolean isProfileChallengeUser =

diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index 7e95a9a..90b281f 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java

@@ -31,6 +31,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling {
 
@@ -73,7 +74,7 @@
         return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;
     }
 
-    public static class SkipDialog extends DialogFragment {
+    public static class SkipDialog extends InstrumentedDialogFragment {
 
         @Override
         public void show(FragmentManager manager, String tag) {
@@ -111,5 +112,10 @@
                             })
                     .create();
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_FINGERPRINT_CANCEL_SETUP;
+        }
     }
 }

diff --git a/src/com/android/settings/fingerprint/SetupSkipDialog.java b/src/com/android/settings/fingerprint/SetupSkipDialog.java
index c6e04d7..9e9bb4c 100644
--- a/src/com/android/settings/fingerprint/SetupSkipDialog.java
+++ b/src/com/android/settings/fingerprint/SetupSkipDialog.java

@@ -25,9 +25,12 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-public class SetupSkipDialog extends DialogFragment implements DialogInterface.OnClickListener {
+public class SetupSkipDialog extends InstrumentedDialogFragment
+        implements DialogInterface.OnClickListener {
 
     public static final String EXTRA_FRP_SUPPORTED = ":settings:frp_supported";
 
@@ -44,6 +47,11 @@
     }
 
     @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_FINGERPRINT_SKIP_SETUP;
+    }
+
+    @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         return onCreateDialogBuilder().create();
     }

diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 6946f62..c448756 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java

@@ -30,11 +30,13 @@
 import android.widget.Checkable;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
-public class HighPowerDetail extends DialogFragment implements OnClickListener,
+public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener,
         View.OnClickListener {
 
     private static final String ARG_DEFAULT_ON = "default_on";
@@ -49,6 +51,11 @@
     private Checkable mOptionOff;
 
     @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_HIGH_POWER_DETAILS;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 

diff --git a/src/com/android/settings/gestures/GesturePreference.java b/src/com/android/settings/gestures/GesturePreference.java
index 2d921bf..4536aa2 100644
--- a/src/com/android/settings/gestures/GesturePreference.java
+++ b/src/com/android/settings/gestures/GesturePreference.java

@@ -58,7 +58,6 @@
     public GesturePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
-        setLayoutResource(R.layout.gesture_preference);
         TypedArray attributes = context.getTheme().obtainStyledAttributes(
                 attrs,
                 R.styleable.GesturePreference,
@@ -70,7 +69,8 @@
                     .appendPath(String.valueOf(animation))
                     .build();
             mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
-            if (mMediaPlayer != null) {
+            if (mMediaPlayer != null && mMediaPlayer.getDuration() > 0) {
+                setLayoutResource(R.layout.gesture_preference);
                 mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
                     @Override
                     public void onSeekComplete(MediaPlayer mp) {
@@ -84,9 +84,8 @@
                         mediaPlayer.setLooping(true);
                     }
                 });
+                mAnimationAvailable = true;
             }
-            mAnimationAvailable = true;
-
         } catch (Exception e) {
             Log.w(TAG, "Animation resource not found. Will not show animation.");
         } finally {
@@ -97,15 +96,14 @@
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
+
+        if (!mAnimationAvailable) {
+            return;
+        }
+
         final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);
         final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);
         final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);
-        final View animationFrame = holder.findViewById(R.id.gesture_animation_frame);
-
-        if (!mAnimationAvailable) {
-            animationFrame.setVisibility(View.GONE);
-            return;
-        }
 
         video.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -182,7 +180,9 @@
     }
 
     void loadPreview(LoaderManager manager, int id) {
-        Loader<Bitmap> loader = manager.initLoader(id, Bundle.EMPTY, this);
+        if (mAnimationAvailable) {
+            Loader<Bitmap> loader = manager.initLoader(id, Bundle.EMPTY, this);
+        }
     }
 
     void onViewVisible() {

diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index 9f127b5..8cb329b 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java

@@ -52,16 +52,16 @@
     private static final String TAG = "GestureSettings";
     private static final String PREF_KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
     private static final String PREF_KEY_DOUBLE_TWIST = "gesture_double_twist";
-    private static final String PREF_KEY_PICK_UP_AND_NUDGE = "gesture_pick_up_and_nudge";
+    private static final String PREF_KEY_PICK_UP = "gesture_pick_up";
     private static final String PREF_KEY_SWIPE_DOWN_FINGERPRINT = "gesture_swipe_down_fingerprint";
+    private static final String PREF_KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen";
     private static final String DEBUG_DOZE_COMPONENT = "debug.doze.component";
-    private static final String ARG_SCROLL_TO_PREFERENCE = "gesture_scroll_to_preference";
     private static final int PREF_ID_DOUBLE_TAP_POWER = 0;
     private static final int PREF_ID_DOUBLE_TWIST = 1;
-    private static final int PREF_ID_PICK_UP_AND_NUDG = 2;
+    private static final int PREF_ID_PICK_UP = 2;
     private static final int PREF_ID_SWIPE_DOWN_FINGERPRINT = 3;
+    private static final int PREF_ID_DOUBLE_TAP_SCREEN = 4;
 
-    private int mScrollPosition = -1;
     private List<GesturePreference> mPreferences;
 
     @Override
@@ -82,16 +82,19 @@
 
         // Ambient Display
         if (isDozeAvailable(context)) {
-            int dozeEnabled = Secure.getInt(getContentResolver(), Secure.DOZE_ENABLED, 1);
-            addPreference(PREF_KEY_PICK_UP_AND_NUDGE, dozeEnabled != 0, PREF_ID_DOUBLE_TWIST);
+            int pickup = Secure.getInt(getContentResolver(), Secure.DOZE_PULSE_ON_PICK_UP, 1);
+            addPreference(PREF_KEY_PICK_UP, pickup != 0, PREF_ID_PICK_UP);
+            int doubleTap = Secure.getInt(getContentResolver(), Secure.DOZE_PULSE_ON_DOUBLE_TAP, 1);
+            addPreference(PREF_KEY_DOUBLE_TAP_SCREEN, doubleTap != 0, PREF_ID_DOUBLE_TAP_SCREEN);
         } else {
-            removePreference(PREF_KEY_PICK_UP_AND_NUDGE);
+            removePreference(PREF_KEY_PICK_UP);
+            removePreference(PREF_KEY_DOUBLE_TAP_SCREEN);
         }
 
         // Fingerprint slide for notifications
         if (isSystemUINavigationAvailable(context)) {
             addPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT, isSystemUINavigationEnabled(context),
-                    PREF_ID_PICK_UP_AND_NUDG);
+                    PREF_ID_SWIPE_DOWN_FINGERPRINT);
         } else {
             removePreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
         }
@@ -100,23 +103,11 @@
         if (isDoubleTwistAvailable(context)) {
             int doubleTwistEnabled = Secure.getInt(
                     getContentResolver(), Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
-            addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0,
-                    PREF_ID_SWIPE_DOWN_FINGERPRINT);
+            addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0, PREF_ID_DOUBLE_TWIST);
         } else {
             removePreference(PREF_KEY_DOUBLE_TWIST);
         }
 
-        if (savedInstanceState == null) {
-            final Bundle args = getArguments();
-            if (args != null && args.containsKey(ARG_SCROLL_TO_PREFERENCE)) {
-                String prefKey = args.getString(ARG_SCROLL_TO_PREFERENCE);
-                GesturePreference pref = (GesturePreference) findPreference(prefKey);
-                if (pref != null) {
-                    mScrollPosition = pref.getOrder();
-                }
-            }
-        }
-
     }
 
     @Override
@@ -124,9 +115,6 @@
                              Bundle savedInstanceState) {
         View view = super.onCreateView(inflater, container, savedInstanceState);
         RecyclerView listview = getListView();
-        if (mScrollPosition >= 0) {
-            listview.scrollToPosition(mScrollPosition);
-        }
         listview.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
@@ -163,8 +151,10 @@
         if (PREF_KEY_DOUBLE_TAP_POWER.equals(key)) {
             Secure.putInt(getContentResolver(),
                     Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? 0 : 1);
-        } else if (PREF_KEY_PICK_UP_AND_NUDGE.equals(key)) {
-            Secure.putInt(getContentResolver(), Secure.DOZE_ENABLED, enabled ? 1 : 0);
+        } else if (PREF_KEY_PICK_UP.equals(key)) {
+            Secure.putInt(getContentResolver(), Secure.DOZE_PULSE_ON_PICK_UP, enabled ? 1 : 0);
+        } else if (PREF_KEY_DOUBLE_TAP_SCREEN.equals(key)) {
+            Secure.putInt(getContentResolver(), Secure.DOZE_PULSE_ON_DOUBLE_TAP, enabled ? 1 : 0);
         } else if (PREF_KEY_SWIPE_DOWN_FINGERPRINT.equals(key)) {
             Secure.putInt(getContentResolver(),
                     Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, enabled ? 1 : 0);
@@ -255,7 +245,8 @@
                     result.add(PREF_KEY_DOUBLE_TAP_POWER);
                 }
                 if (!isDozeAvailable(context)) {
-                    result.add(PREF_KEY_PICK_UP_AND_NUDGE);
+                    result.add(PREF_KEY_PICK_UP);
+                    result.add(PREF_KEY_DOUBLE_TAP_SCREEN);
                 }
                 if (!isSystemUINavigationAvailable(context)) {
                     result.add(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
@@ -267,4 +258,4 @@
             }
         };
 
-}
\ No newline at end of file
+}

diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
index ad7a2b1..24bdd61 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java

@@ -40,12 +40,14 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
-public class KeyboardLayoutDialogFragment extends DialogFragment
+public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment
         implements InputDeviceListener, LoaderCallbacks<KeyboardLayoutDialogFragment.Keyboards> {
     private static final String KEY_INPUT_DEVICE_IDENTIFIER = "inputDeviceIdentifier";
 
@@ -62,6 +64,12 @@
         mInputDeviceIdentifier = inputDeviceIdentifier;
     }
 
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_KEYBOARD_LAYOUT;
+    }
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);

diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 78e90c8..ad3daae 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java

@@ -31,6 +31,7 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.utils.ManagedServiceSettings;
 import com.android.settings.utils.ServiceListing;
 
@@ -102,7 +103,7 @@
         });
     }
 
-    public class FriendlyWarningDialogFragment extends DialogFragment {
+    public class FriendlyWarningDialogFragment extends InstrumentedDialogFragment {
         static final String KEY_COMPONENT = "c";
         static final String KEY_LABEL = "l";
 
@@ -115,6 +116,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_DISABLE_NOTIFICATION_ACCESS;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             final Bundle args = getArguments();

diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 8b8ef9e..7365995 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java

@@ -66,6 +66,7 @@
 import com.android.settings.DefaultRingtonePreference;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -826,12 +827,17 @@
         mWorkAlarmRingtonePreference = null;
     }
 
-    public static class UnifyWorkDialogFragment extends DialogFragment
+    public static class UnifyWorkDialogFragment extends InstrumentedDialogFragment
             implements DialogInterface.OnClickListener {
         private static final String TAG = "UnifyWorkDialogFragment";
         private static final int REQUEST_CODE = 200;
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_UNIFY_SOUND_SETTINGS;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new AlertDialog.Builder(getActivity())
                     .setTitle(R.string.work_sync_dialog_title)

diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index b0e8e9b..7312b1d 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java

@@ -46,6 +46,7 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -203,10 +204,15 @@
     /**
      * Warning dialog when allowing zen access warning about the privileges being granted.
      */
-    public static class ScaryWarningDialogFragment extends DialogFragment {
+    public static class ScaryWarningDialogFragment extends InstrumentedDialogFragment {
         static final String KEY_PKG = "p";
         static final String KEY_LABEL = "l";
 
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_ZEN_ACCESS_GRANT;
+        }
+
         public ScaryWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
             Bundle args = new Bundle();
             args.putString(KEY_PKG, pkg);
@@ -249,10 +255,16 @@
     /**
      * Warning dialog when revoking zen access warning that zen rule instances will be deleted.
      */
-    public static class FriendlyWarningDialogFragment extends DialogFragment {
+    public static class FriendlyWarningDialogFragment extends InstrumentedDialogFragment {
         static final String KEY_PKG = "p";
         static final String KEY_LABEL = "l";
 
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_ZEN_ACCESS_REVOKE;
+        }
+
         public FriendlyWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
             Bundle args = new Bundle();
             args.putString(KEY_PKG, pkg);

diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
index dbead5a..f897733 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java

@@ -39,7 +39,6 @@
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.View;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.utils.ManagedServiceSettings.Config;
@@ -109,7 +108,7 @@
         new ZenRuleNameDialog(mContext, null) {
             @Override
             public void onOk(String ruleName) {
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE_OK);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE_OK);
                 AutomaticZenRule rule = new AutomaticZenRule(ruleName, ri.serviceComponent,
                         ri.defaultConditionId, NotificationManager.INTERRUPTION_FILTER_PRIORITY,
                         true);
@@ -129,7 +128,8 @@
                         new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE_OK);
+                        mMetricsFeatureProvider.action(mContext,
+                                MetricsEvent.ACTION_ZEN_DELETE_RULE_OK);
                         removeZenRule(ruleId);
                     }
                 })
@@ -173,7 +173,7 @@
         p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ADD_RULE);
                 showAddRuleDialog();
                 return true;
             }

diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index 4705d4d..cfac1f5 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java

@@ -27,7 +27,6 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.search.Indexable;
@@ -64,7 +63,8 @@
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (mDisableListeners) return true;
                 final boolean val = (Boolean) newValue;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REMINDERS, val);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REMINDERS,
+                        val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + val);
                 savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_REMINDERS),
                         mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
@@ -79,7 +79,7 @@
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (mDisableListeners) return true;
                 final boolean val = (Boolean) newValue;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_EVENTS, val);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_EVENTS, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowEvents=" + val);
                 savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_EVENTS),
                         mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
@@ -98,7 +98,7 @@
                 final boolean allowMessages = val != SOURCE_NONE;
                 final int allowMessagesFrom =
                         val == SOURCE_NONE ? mPolicy.priorityMessageSenders : val;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_MESSAGES, val);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_MESSAGES, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowMessages=" + allowMessages
                         + " allowMessagesFrom=" + ZenModeConfig.sourceToString(allowMessagesFrom));
                 savePolicy(
@@ -118,7 +118,7 @@
                 final int val = Integer.parseInt((String) newValue);
                 final boolean allowCalls = val != SOURCE_NONE;
                 final int allowCallsFrom = val == SOURCE_NONE ? mPolicy.priorityCallSenders : val;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_CALLS, val);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_CALLS, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + allowCalls
                         + " allowCallsFrom=" + ZenModeConfig.sourceToString(allowCallsFrom));
                 savePolicy(getNewPriorityCategories(allowCalls, Policy.PRIORITY_CATEGORY_CALLS),
@@ -137,7 +137,8 @@
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (mDisableListeners) return true;
                 final boolean val = (Boolean) newValue;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REPEAT_CALLS, val);
+                mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_REPEAT_CALLS,
+                        val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowRepeatCallers=" + val);
                 int priorityCategories = getNewPriorityCategories(val,
                         NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS);

diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
index d251580..8ebb4dc 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java

@@ -39,7 +39,6 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -163,7 +162,7 @@
         if (mDisableListeners) return;
         final boolean enabled = isChecked;
         if (enabled == mRule.isEnabled()) return;
-        MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ENABLE_RULE, enabled);
+        mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_ENABLE_RULE, enabled);
         if (DEBUG) Log.d(TAG, "onSwitchChanged enabled=" + enabled);
         mRule.setEnabled(enabled);
         setZenRule(mId, mRule);
@@ -207,7 +206,7 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         if (DEBUG) Log.d(TAG, "onOptionsItemSelected " + item.getItemId());
         if (item.getItemId() == R.id.delete) {
-            MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE);
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE);
             showDeleteRuleDialog();
             return true;
         }
@@ -241,7 +240,8 @@
                 .setPositiveButton(R.string.zen_mode_delete_rule_button, new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_DELETE_RULE_OK);
+                        mMetricsFeatureProvider.action(mContext,
+                                MetricsEvent.ACTION_ZEN_DELETE_RULE_OK);
                         mDeleting = true;
                         removeZenRule(mId);
                     }

diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
index d2dcdf8..7a816c3 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java

@@ -39,6 +39,7 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -275,11 +276,16 @@
             setSummary(time);
         }
 
-        public static class TimePickerFragment extends DialogFragment implements
+        public static class TimePickerFragment extends InstrumentedDialogFragment implements
                 TimePickerDialog.OnTimeSetListener {
             public TimePickerPreference pref;
 
             @Override
+            public int getMetricsCategory() {
+                return MetricsEvent.DIALOG_ZEN_TIMEPICKER;
+            }
+
+            @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;
                 final Calendar c = Calendar.getInstance();

diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
index 35f3ab6..016e381 100644
--- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
+++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java

@@ -18,23 +18,15 @@
 
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
-import android.content.Context;
 import android.os.Bundle;
-import android.provider.SearchIndexableResource;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
 import com.android.settings.R;
 
-import java.util.Arrays;
-import java.util.List;
-
 public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
 
     private static final String KEY_SCREEN_OFF = "screenOff";
@@ -64,7 +56,8 @@
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (mDisableListeners) return true;
                 final boolean val = (Boolean) newValue;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_WHEN_SCREEN_OFF, val);
+                mMetricsFeatureProvider.action(mContext,
+                        MetricsEvent.ACTION_ZEN_ALLOW_WHEN_SCREEN_OFF, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange suppressWhenScreenOff=" + val);
                 savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_SCREEN_OFF));
                 return true;
@@ -77,7 +70,8 @@
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if (mDisableListeners) return true;
                 final boolean val = (Boolean) newValue;
-                MetricsLogger.action(mContext, MetricsEvent.ACTION_ZEN_ALLOW_WHEN_SCREEN_ON, val);
+                mMetricsFeatureProvider.action(mContext,
+                        MetricsEvent.ACTION_ZEN_ALLOW_WHEN_SCREEN_ON, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange suppressWhenScreenOn=" + val);
                 savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_SCREEN_ON));
                 return true;

diff --git a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
index dc2b983..2d9dd8b 100644
--- a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java
+++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java

@@ -32,7 +32,6 @@
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -78,7 +77,7 @@
     @Override
     public void onClick(DialogInterface dialog, int which) {
         if (which == Dialog.BUTTON_NEGATIVE) {
-            MetricsLogger.action(getContext(),
+            mMetricsFeatureProvider.action(getContext(),
                     MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_CANCEL);
             return;
         }
@@ -89,7 +88,8 @@
                 FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);
         supportFeatureProvider.setShouldShowDisclaimerDialog(getContext(), !doNotShow.isChecked());
         final Bundle bundle = getArguments();
-        MetricsLogger.action(activity, MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_OK);
+        mMetricsFeatureProvider.action(activity,
+                MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_OK);
         supportFeatureProvider.startSupport(getActivity(),
                 bundle.getParcelable(EXTRA_ACCOUNT), bundle.getInt(EXTRA_TYPE));
     }
@@ -97,7 +97,7 @@
     @Override
     public void onCancel(DialogInterface dialog) {
         super.onCancel(dialog);
-        MetricsLogger.action(getContext(),
+        mMetricsFeatureProvider.action(getContext(),
                 MetricsProto.MetricsEvent.ACTION_SUPPORT_DISCLAIMER_CANCEL);
     }
 

diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java
index 4b2a9ce..c15070b 100644
--- a/src/com/android/settings/support/SupportPhoneDialogFragment.java
+++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java

@@ -24,7 +24,6 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -76,7 +75,7 @@
                 .queryIntentActivities(intent, 0)
                 .isEmpty();
         if (canDial) {
-            MetricsLogger.action(getActivity(),
+            mMetricsFeatureProvider.action(getActivity(),
                     MetricsProto.MetricsEvent.ACTION_SUPPORT_DIAL_TOLLED);
             getActivity().startActivity(intent);
         }

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/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index 14c9b61..bd839c8 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java

@@ -35,7 +35,9 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.notification.EmptyTextSettings;
 
 import java.util.Collections;
@@ -130,10 +132,15 @@
         }
     }
 
-    public static class ScaryWarningDialogFragment extends DialogFragment {
+    public static class ScaryWarningDialogFragment extends InstrumentedDialogFragment {
         static final String KEY_COMPONENT = "c";
         static final String KEY_LABEL = "l";
 
+        @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_SERVICE_ACCESS_WARNING;
+        }
+
         public ScaryWarningDialogFragment setServiceInfo(ComponentName cn, String label,
                 Fragment target) {
             Bundle args = new Bundle();

diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index 8013780..6093e89 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java

@@ -31,13 +31,15 @@
 import android.os.UserManager;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 /**
  * Fragment wrapper around an {@link AppDialog}.
  */
-public class AppDialogFragment extends DialogFragment implements AppDialog.Listener {
+public class AppDialogFragment extends InstrumentedDialogFragment implements AppDialog.Listener {
     private static final String TAG_APP_DIALOG = "vpnappdialog";
     private static final String TAG = "AppDialogFragment";
 
@@ -53,9 +55,14 @@
     private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
             ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
 
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_VPN_APP_CONFIG;
+    }
+
     public interface Listener {
-        public void onForget();
-        public void onCancel();
+        void onForget();
+        void onCancel();
     }
 
     public static void show(Fragment parent, PackageInfo packageInfo, String label,

diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index e9dd4fd..1a3000e 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java

@@ -42,6 +42,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.RestrictedPreference;
 
@@ -303,10 +304,15 @@
         return getAlwaysOnVpnPackage() != null && !isVpnAlwaysOn();
     }
 
-    public static class CannotConnectFragment extends DialogFragment {
+    public static class CannotConnectFragment extends InstrumentedDialogFragment {
         private static final String TAG = "CannotConnect";
         private static final String ARG_VPN_LABEL = "label";
 
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_VPN_CANNOT_CONNECT;
+        }
+
         public static void show(AppManagementFragment parent, String vpnLabel) {
             if (parent.getFragmentManager().findFragmentByTag(TAG) == null) {
                 final Bundle args = new Bundle();
@@ -329,10 +335,15 @@
         }
     }
 
-    public static class ReplaceExistingVpnFragment extends DialogFragment
+    public static class ReplaceExistingVpnFragment extends InstrumentedDialogFragment
             implements DialogInterface.OnClickListener {
         private static final String TAG = "ReplaceExistingVpn";
 
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_VPN_REPLACE_EXISTING;
+        }
+
         public static void show(AppManagementFragment parent) {
             if (parent.getFragmentManager().findFragmentByTag(TAG) == null) {
                 final ReplaceExistingVpnFragment frag = new ReplaceExistingVpnFragment();

diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 1880a6b..1a180c5 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java

@@ -16,8 +16,6 @@
 
 package com.android.settings.vpn2;
 
-import java.util.Arrays;
-
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.Context;
@@ -33,16 +31,18 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 /**
  * Fragment wrapper around a {@link ConfigDialog}.
  */
-public class ConfigDialogFragment extends DialogFragment implements
-        DialogInterface.OnClickListener {
+public class ConfigDialogFragment extends InstrumentedDialogFragment
+        implements DialogInterface.OnClickListener {
     private static final String TAG_CONFIG_DIALOG = "vpnconfigdialog";
     private static final String TAG = "ConfigDialogFragment";
 
@@ -55,6 +55,12 @@
 
     private boolean mUnlocking = false;
 
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_LEGACY_VPN_CONFIG;
+    }
+
     public static void show(VpnSettings parent, VpnProfile profile, boolean edit, boolean exists) {
         if (!parent.isAdded()) return;
 

diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 240c062..e998e79 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java

@@ -34,14 +34,15 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 import java.util.ArrayList;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
         View.OnClickListener {
 
@@ -55,6 +56,7 @@
         void onSwitchChanged(Switch switchView, boolean isChecked);
     }
 
+    private MetricsFeatureProvider mMetricsFeatureProvider;
     private final TextAppearanceSpan mSummarySpan;
 
     private ToggleSwitch mSwitch;
@@ -130,6 +132,8 @@
 
         // Default is hide
         setVisibility(View.GONE);
+
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
 
     public void setMetricsTag(String tag) {
@@ -230,7 +234,7 @@
     @Override
     public void onClick(View v) {
         if (mDisabledByAdmin) {
-            MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|restricted", 1);
+            mMetricsFeatureProvider.count(mContext, mMetricsTag + "/switch_bar|restricted", 1);
             RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mEnforcedAdmin);
         } else {
             final boolean isChecked = !mSwitch.isChecked();
@@ -248,7 +252,7 @@
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (mLoggingIntialized) {
-            MetricsLogger.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
+            mMetricsFeatureProvider.count(mContext, mMetricsTag + "/switch_bar|" + isChecked, 1);
         }
         mLoggingIntialized = true;
         propagateChecked(isChecked);

diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index f53f59a..b0bdd77 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java

@@ -31,6 +31,7 @@
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 public class AdvancedWifiSettings extends RestrictedSettingsFragment {
@@ -117,7 +118,7 @@
     }
 
     /* Wrapper class for the WPS dialog to properly handle life cycle events like rotation. */
-    public static class WpsFragment extends DialogFragment {
+    public static class WpsFragment extends InstrumentedDialogFragment {
         private static int mWpsSetup;
 
         // Public default constructor is required for rotation.
@@ -131,6 +132,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_WPS_SETUP;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new WpsDialog(getActivity(), mWpsSetup);
         }

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/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index f064050..4a02197 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java

@@ -32,9 +32,9 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.search.Index;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedLockUtils;
@@ -44,12 +44,16 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class WifiEnabler implements SwitchBar.OnSwitchChangeListener  {
+
+    private final SwitchBar mSwitchBar;
+    private final WifiManager mWifiManager;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+
     private Context mContext;
-    private SwitchBar mSwitchBar;
     private boolean mListeningToOnSwitchChange = false;
     private AtomicBoolean mConnected = new AtomicBoolean(false);
 
-    private final WifiManager mWifiManager;
+
     private boolean mStateMachineEvent;
     private final IntentFilter mIntentFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -89,10 +93,11 @@
         }
     };
 
-    public WifiEnabler(Context context, SwitchBar switchBar) {
+    public WifiEnabler(Context context, SwitchBar switchBar,
+            MetricsFeatureProvider metricsFeatureProvider) {
         mContext = context;
         mSwitchBar = switchBar;
-
+        mMetricsFeatureProvider = metricsFeatureProvider;
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
 
         mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
@@ -226,7 +231,7 @@
         if (mayDisableTethering(isChecked)) {
             mWifiManager.setWifiApEnabled(null, false);
         }
-        MetricsLogger.action(mContext,
+        mMetricsFeatureProvider.action(mContext,
                 isChecked ? MetricsEvent.ACTION_WIFI_ON : MetricsEvent.ACTION_WIFI_OFF);
         if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error

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/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index 893aaf4..29ef79e 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java

@@ -28,7 +28,9 @@
 import android.os.Bundle;
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 /**
  * This activity requests users permission to allow scanning even when Wi-Fi is turned off
@@ -104,7 +106,7 @@
         createDialog();
     }
 
-    public static class AlertDialogFragment extends DialogFragment {
+    public static class AlertDialogFragment extends InstrumentedDialogFragment {
         static AlertDialogFragment newInstance(String app) {
             AlertDialogFragment frag = new AlertDialogFragment(app);
             return frag;
@@ -122,6 +124,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_WIFI_SCAN_MODE;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new AlertDialog.Builder(getActivity())
                     .setMessage(getString(R.string.wifi_scan_always_turnon_message, mApp))

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

@@ -57,7 +57,6 @@
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
-import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
@@ -308,7 +307,7 @@
      */
     /* package */ WifiEnabler createWifiEnabler() {
         final SettingsActivity activity = (SettingsActivity) getActivity();
-        return new WifiEnabler(activity, activity.getSwitchBar());
+        return new WifiEnabler(activity, activity.getSwitchBar(), mMetricsFeatureProvider);
     }
 
     @Override
@@ -411,7 +410,7 @@
                 showDialog(WPS_PIN_DIALOG_ID);
                 return true;
             case MENU_ID_SCAN:
-                MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORCE_SCAN);
+                mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_FORCE_SCAN);
                 mWifiTracker.forceScan();
                 return true;
             case MENU_ID_ADVANCED:
@@ -597,6 +596,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.
@@ -831,7 +846,7 @@
     }
 
     /* package */ void forget() {
-        MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET);
+        mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET);
         if (!mSelectedAccessPoint.isSaved()) {
             if (mSelectedAccessPoint.getNetworkInfo() != null &&
                     mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
@@ -854,12 +869,12 @@
     }
 
     protected void connect(final WifiConfiguration config) {
-        MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
+        mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
         mWifiManager.connect(config, mConnectListener);
     }
 
     protected void connect(final int networkId) {
-        MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
+        mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
         mWifiManager.connect(networkId, mConnectListener);
     }
 
@@ -867,7 +882,7 @@
      * Called when "add network" button is pressed.
      */
     /* package */ void onAddNetworkPressed() {
-        MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK);
+        mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK);
         // No exact access point is selected.
         mSelectedAccessPoint = null;
         showDialog(null, WifiConfigUiBase.MODE_CONNECT);

diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 2264546..70370b2 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java

@@ -32,9 +32,11 @@
 import android.support.v14.preference.PreferenceFragment;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.settings.ButtonBarHandler;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.setupwizardlib.view.NavigationBar;
 
 public class WifiSetupActivity extends WifiPickerActivity
@@ -240,7 +242,7 @@
         return info != null && info.isConnected();
     }
 
-    public static class WifiSkipDialog extends DialogFragment {
+    public static class WifiSkipDialog extends InstrumentedDialogFragment {
         public static WifiSkipDialog newInstance(int messageRes) {
             final Bundle args = new Bundle();
             args.putInt("messageRes", messageRes);
@@ -254,6 +256,11 @@
         }
 
         @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_WIFI_SKIP;
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             int messageRes = getArguments().getInt("messageRes");
             final AlertDialog dialog = new AlertDialog.Builder(getActivity())

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/app/Android.mk b/tests/app/Android.mk
index a641648..979c27d 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk

@@ -7,15 +7,13 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
 
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4
-
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
     mockito-target \
     espresso-core \
-    espresso-contrib \
-    espresso-intents
+    espresso-contrib-nodep \
+    espresso-intents-nodep \
+    ub-uiautomator
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)

diff --git a/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java b/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java
new file mode 100644
index 0000000..4f3a524
--- /dev/null
+++ b/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java

@@ -0,0 +1,195 @@
+/*
+ * 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.gesture;
+
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings.Secure;
+import android.support.test.filters.MediumTest;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.UiScrollable;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+import android.widget.RelativeLayout;
+import android.widget.Switch;
+
+import com.android.settings.R;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+import org.junit.Test;
+
+/**
+ * Test for Gesture preferences.
+ */
+@MediumTest
+public class GestureSettingsTest extends InstrumentationTestCase {
+
+    private static final String TAG = "GestureSettingsTest";
+
+    private UiDevice mDevice;
+    private Context mTargetContext;
+    private String mTargetPackage;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mTargetContext = getInstrumentation().getTargetContext();
+        mTargetPackage = mTargetContext.getPackageName();
+    }
+
+    @Test
+    public void testAmbientDisplaySwitchPreference() throws Exception {
+        launchSettings();
+        UiObject dozeSwitch = getDozeSwitch();
+        assertNotNull(dozeSwitch);
+        assertTrue(dozeSwitch.exists());
+        assertToggleStateMatchesSettingValue(dozeSwitch, Secure.DOZE_ENABLED, 1, 1);
+    }
+
+    @Test
+    public void testGestureSettingsExists() throws Exception {
+        launchMoves();
+        UiObject titleObj = mDevice.findObject(new UiSelector().text(
+                mTargetContext.getResources().getString(R.string.gesture_preference_title)));
+        assertNotNull(titleObj);
+        assertTrue(titleObj.exists());
+    }
+
+    @Test
+    public void testCameraDoubleTapToggle() throws Exception {
+        assertSwitchToggle(mTargetContext.getResources().getString(
+                R.string.double_tap_power_for_camera_title),
+                Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0, 0);
+    }
+
+    @Test
+    public void testCameraDoubleTwistToggle() throws Exception {
+        assertSwitchToggle(mTargetContext.getResources().getString(
+                R.string.double_twist_for_camera_mode_title),
+                Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, 1);
+    }
+
+    @Test
+    public void testFingerprintSwipeToggle() throws Exception {
+        assertSwitchToggle(mTargetContext.getResources().getString(
+                R.string.fingerprint_swipe_for_notifications_title),
+                Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0, 1);
+    }
+
+    @Test
+    public void testDozeDoubleTapToggle() throws Exception {
+        assertSwitchToggle(mTargetContext.getResources().getString(
+                R.string.ambient_display_title),
+                Secure.DOZE_PULSE_ON_DOUBLE_TAP, 1, 1);
+    }
+
+    @Test
+    public void testDozePickupToggle() throws Exception {
+        assertSwitchToggle(mTargetContext.getResources().getString(
+                R.string.ambient_display_pickup_title),
+                Secure.DOZE_PULSE_ON_PICK_UP, 1, 1);
+    }
+
+    private void launchSettings() {
+        Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_LAUNCHER)
+                .setPackage(mTargetPackage)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(settingsIntent);
+    }
+
+    private void launchMoves() throws Exception  {
+        launchSettings();
+        UiScrollable settings = new UiScrollable(
+                new UiSelector().packageName(mTargetPackage).scrollable(true));
+        String titleMoves =
+                mTargetContext.getResources().getString(R.string.gesture_preference_title);
+        settings.scrollTextIntoView(titleMoves);
+        mDevice.findObject(new UiSelector().text(titleMoves)).click();
+    }
+
+    private void navigateToMovesSetting(String title) throws Exception {
+        launchMoves();
+        UiScrollable moves = new UiScrollable(
+                new UiSelector().packageName(mTargetPackage).scrollable(true));
+        moves.scrollTextIntoView(title);
+    }
+
+    private UiScrollable navigateToAmbientDisplay() throws Exception {
+        UiScrollable settings = new UiScrollable(
+                new UiSelector().packageName(mTargetPackage).scrollable(true));
+        String titleDisplay =
+                mTargetContext.getResources().getString(R.string.display_settings_title);
+        settings.scrollTextIntoView(titleDisplay);
+        mDevice.findObject(new UiSelector().text(titleDisplay)).click();
+        settings.scrollTextIntoView(mTargetContext.getResources().getString(R.string.doze_title));
+        return settings;
+    }
+
+    private UiObject getGestureSwitch(String title) throws Exception {
+        UiObject titleView = mDevice.findObject(new UiSelector().text(title));
+        UiObject gestureSwitch =
+            titleView.getFromParent(new UiSelector().className(Switch.class.getName()));
+        assertNotNull(gestureSwitch);
+        assertTrue(gestureSwitch.exists());
+        return gestureSwitch;
+    }
+
+    private UiObject getDozeSwitch() throws Exception {
+        UiScrollable settings = navigateToAmbientDisplay();
+        UiObject dozeSwitch = null;
+        UiSelector relativeLayoutSelector =
+                new UiSelector().className(RelativeLayout.class.getName());
+        String titleDoze = mTargetContext.getResources().getString(R.string.doze_title);
+        for (int i = 0; i <= settings.getChildCount(relativeLayoutSelector); i++) {
+            UiObject relativeLayout = settings.getChild(relativeLayoutSelector.instance(i));
+            if (relativeLayout.getChildCount() != 2) {
+                continue;
+            }
+            UiObject obj1 = relativeLayout.getChild(new UiSelector().index(0));
+            if (obj1.getText() == titleDoze) {
+                return relativeLayout.getFromParent(
+                        new UiSelector().className(Switch.class.getName()));
+            }
+        }
+        return null;
+    }
+
+    private void assertSwitchToggle(String title, String key, int defaultVal, int enabledVal)
+            throws Exception {
+        navigateToMovesSetting(title);
+        assertToggleStateMatchesSettingValue(getGestureSwitch(title), key, defaultVal, enabledVal);
+    }
+
+    private void assertToggleStateMatchesSettingValue (
+            UiObject testSwitch, String key, int defaultVal, int enabledVal) throws Exception {
+        // check initial state
+        int currentValue = Secure.getInt(mTargetContext.getContentResolver(), key, defaultVal);
+        boolean enabled = currentValue == enabledVal;
+        assertEquals(enabled, testSwitch.isChecked());
+        // toggle the preference
+        testSwitch.click();
+        assertEquals(!enabled, testSwitch.isChecked());
+        int newValue = currentValue == 1 ? 0 : 1;
+        assertEquals(newValue, Secure.getInt(mTargetContext.getContentResolver(), key, defaultVal));
+    }
+
+}

diff --git a/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java b/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java
new file mode 100644
index 0000000..234f8e6
--- /dev/null
+++ b/tests/app/src/com/android/settings/tests/DrawOverlayDetailsTest.java

@@ -0,0 +1,62 @@
+/*
+ * 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.tests;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import org.junit.runner.RunWith;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import com.android.settings.R;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.core.IsNot.not;
+import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DrawOverlayDetailsTest {
+    private final static String PACKAGE_SYSTEM_UI = "com.android.systemui";
+
+    @Test
+    public void testSystemUiDrawOverlayDetails_Disabled() throws Exception{
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(new Intent(android.provider.Settings
+                .ACTION_MANAGE_OVERLAY_PERMISSION));
+
+        final Context targetContext = instrumentation.getTargetContext();
+
+        final PackageManager packageManager = targetContext.getPackageManager();
+        final String appName = (String) packageManager.getApplicationLabel(packageManager
+                .getApplicationInfo(PACKAGE_SYSTEM_UI, PackageManager.GET_META_DATA));
+
+        openActionBarOverflowOrOptionsMenu(targetContext);
+        onView(withText(targetContext.getString(R.string.menu_show_system))).perform(click());
+        onView(withText(appName)).perform(click());
+        onView(withText(targetContext.getString(R.string.permit_draw_overlay))).check(matches
+                (not(isEnabled())));
+    }
+
+}

diff --git a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
new file mode 100644
index 0000000..6289f1b
--- /dev/null
+++ b/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java

@@ -0,0 +1,43 @@
+/*
+ * 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.tests;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import com.android.settings.Settings;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class PrivateVolumeSettingsTest {
+    @Test
+    public void test_ManageStorageNotShown() {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.startActivitySync(
+                new Intent(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS));
+        onView(withText(com.android.settings.R.string.storage_menu_manage)).check(doesNotExist());
+    }
+}
\ No newline at end of file

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

@@ -8,14 +8,15 @@
 
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    platform-system-robolectric
+    platform-system-robolectric \
+    truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := \
     junit4-target \
     platform-robolectric-prebuilt \
-    sdk_v23
+    sdk_vcurrent
 
-LOCAL_APK_LIBRARIES = Settings
+LOCAL_INSTRUMENTATION_FOR := Settings
 LOCAL_MODULE := SettingsRoboTests
 
 LOCAL_MODULE_TAGS := optional

diff --git a/tests/robotests/src/com/android/internal/app/NightDisplayController.java b/tests/robotests/src/com/android/internal/app/NightDisplayController.java
new file mode 100644
index 0000000..2125c19
--- /dev/null
+++ b/tests/robotests/src/com/android/internal/app/NightDisplayController.java

@@ -0,0 +1,27 @@
+/*
+ * 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.internal.app;
+
+/**
+ * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
+ * API 25.
+ */
+public class NightDisplayController {
+
+    public interface Callback {
+
+    }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * 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.Activity;
+import android.provider.Settings.System;
+
+import com.android.settings.dashboard.SummaryLoader;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DisplaySettingsTest {
+
+  private Activity mActivity;
+  @Mock private SummaryLoader mSummaryLoader;
+  private SummaryLoader.SummaryProvider mSummaryProvider;
+
+  @Before
+  public void setUp() {
+    MockitoAnnotations.initMocks(this);
+    mActivity = Robolectric.buildActivity(Activity.class).get();
+    mSummaryProvider = DisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
+            mActivity, mSummaryLoader);
+  }
+
+  @Test
+  public void testInvalidTimeouts_summaryShouldBeEmpty() {
+    System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, -1);
+    assertEquals(System.getLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 0), -1);
+    mSummaryProvider.setListening(true);
+
+    System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 1234);
+    mSummaryProvider.setListening(true);
+
+    verify(mSummaryLoader, times(2)).setSummary(mSummaryProvider, "");
+  }
+
+  @Test
+  public void testValidTimeouts_summaryShouldNotBeEmpty() {
+    final CharSequence[] values =
+            mActivity.getResources().getTextArray(R.array.screen_timeout_values);
+
+    for (CharSequence value : values) {
+      long timeout = Long.parseLong(value.toString());
+      System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, timeout);
+      assertEquals(System.getLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 0), timeout);
+      mSummaryProvider.setListening(true);
+    }
+
+    verify(mSummaryLoader, never()).setSummary(mSummaryProvider, "");
+  }
+}

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
new file mode 100644
index 0000000..e55f069
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java

@@ -0,0 +1,81 @@
+/*
+ * 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;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SummaryPreferenceTest {
+
+    private Context mContext;
+    private PreferenceViewHolder mHolder;
+    private SummaryPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPreference = new SummaryPreference(mContext, null);
+
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+
+        mHolder = new PreferenceViewHolder(view);
+    }
+
+    @Test
+    public void disableChart_shouldNotRender() {
+        mPreference.setChartEnabled(false);
+        mPreference.onBindViewHolder(mHolder);
+
+        assertTrue(
+                TextUtils.isEmpty(((TextView) mHolder.findViewById(android.R.id.text1)).getText()));
+        assertTrue(
+                TextUtils.isEmpty(((TextView) mHolder.findViewById(android.R.id.text2)).getText()));
+    }
+
+    @Test
+    public void enableChart_shouldRender() {
+        final String testLabel1 = "label1";
+        final String testLabel2 = "label2";
+        mPreference.setChartEnabled(true);
+        mPreference.setLabels(testLabel1, testLabel2);
+        mPreference.onBindViewHolder(mHolder);
+
+        assertEquals(testLabel1,
+                ((TextView) mHolder.findViewById(android.R.id.text1)).getText());
+        assertEquals(testLabel2,
+                ((TextView) mHolder.findViewById(android.R.id.text2)).getText());
+    }
+
+}

diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
new file mode 100644
index 0000000..f9e6b46
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java

@@ -0,0 +1,66 @@
+/*
+ * 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.core.instrumentation;
+
+import android.os.Bundle;
+
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentTestUtil;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class InstrumentedDialogFragmentTest {
+
+    public static class TestDialogFragment extends InstrumentedDialogFragment {
+        static final int TEST_METRIC = 1234;
+
+        public MetricsFeatureProvider getMetricsFeatureProvider() {
+            return mMetricsFeatureProvider;
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            assertThat(mMetricsFeatureProvider).isNotNull();
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return TEST_METRIC;
+        }
+    }
+
+    @Test
+    public void runThroughFragmentLifecycles_shouldHaveMetricsFeatureProviderOnAttach() {
+        final TestDialogFragment fragment = new TestDialogFragment();
+
+        // Precondition: no metrics feature
+        assertThat(fragment.getMetricsFeatureProvider()).isNull();
+
+        FragmentTestUtil.startFragment(fragment);
+
+        // Verify: has metrics feature
+        assertThat(fragment.getMetricsFeatureProvider()).isNotNull();
+    }
+}

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/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
new file mode 100644
index 0000000..5c0c02a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java

@@ -0,0 +1,120 @@
+/*
+ * 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.dashboard.conditional;
+
+import android.content.Context;
+import android.graphics.drawable.Icon;
+
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+
+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 com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConditionTest {
+
+    @Mock
+    private ConditionManager mConditionManager;
+    @Mock
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    private TestCondition mCondition;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mCondition = new TestCondition(mConditionManager, mMetricsFeatureProvider);
+    }
+
+    @Test
+    public void initialize_shouldNotBeSilenced() {
+        assertThat(mCondition.isSilenced()).isFalse();
+    }
+
+    @Test
+    public void silence_shouldNotifyDataChangeAndLog() {
+        mCondition.silence();
+
+        assertThat(mCondition.isSilenced()).isTrue();
+        verify(mConditionManager).notifyChanged(mCondition);
+        verify(mMetricsFeatureProvider).action(any(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_DISMISS),
+                eq(TestCondition.TEST_METRIC_CONSTANT));
+    }
+
+    private static final class TestCondition extends Condition {
+
+        private static final int TEST_METRIC_CONSTANT = 1234;
+
+        TestCondition(ConditionManager manager,
+                MetricsFeatureProvider metricsFeatureProvider) {
+            super(manager, metricsFeatureProvider);
+        }
+
+        @Override
+        public void refreshState() {
+
+        }
+
+        @Override
+        public int getMetricsConstant() {
+            return TEST_METRIC_CONSTANT;
+        }
+
+        @Override
+        public Icon getIcon() {
+            return null;
+        }
+
+        @Override
+        public CharSequence getTitle() {
+            return null;
+        }
+
+        @Override
+        public CharSequence getSummary() {
+            return null;
+        }
+
+        @Override
+        public CharSequence[] getActions() {
+            return new CharSequence[0];
+        }
+
+        @Override
+        public void onPrimaryClick() {
+
+        }
+
+        @Override
+        public void onActionClick(int index) {
+
+        }
+    }
+}

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/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
new file mode 100644
index 0000000..a04861d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java

@@ -0,0 +1,64 @@
+/*
+ * 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.datausage;
+
+import android.content.pm.ApplicationInfo;
+import android.os.Process;
+
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState;
+
+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 com.google.common.truth.Truth.assertThat;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UnrestrictedDataAccessTest {
+
+    @Mock
+    private ApplicationsState.AppEntry mAppEntry;
+    private UnrestrictedDataAccess mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFragment = new UnrestrictedDataAccess();
+    }
+
+    @Test
+    public void testShouldAddPreferenceForApps() {
+        mAppEntry.info = new ApplicationInfo();
+        mAppEntry.info.uid = Process.FIRST_APPLICATION_UID + 10;
+
+        assertThat(mFragment.shouldAddPreference(mAppEntry)).isTrue();
+    }
+
+    @Test
+    public void testShouldNotAddPreferenceForNonApps() {
+        mAppEntry.info = new ApplicationInfo();
+        mAppEntry.info.uid = Process.FIRST_APPLICATION_UID - 10;
+
+        assertThat(mFragment.shouldAddPreference(mAppEntry)).isFalse();
+    }
+
+}

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);
     }
 
 

diff --git a/tests/unit/src/com/android/settings/WallpaperPreferenceLayoutTest.java b/tests/unit/src/com/android/settings/WallpaperPreferenceLayoutTest.java
new file mode 100644
index 0000000..4448307
--- /dev/null
+++ b/tests/unit/src/com/android/settings/WallpaperPreferenceLayoutTest.java

@@ -0,0 +1,34 @@
+/*
+ * 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.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class WallpaperPreferenceLayoutTest {
+    @Test
+    public void testInflateWallpaperPreferenceLayout_doesNotCrash() {
+      LayoutInflater.from(InstrumentationRegistry.getTargetContext())
+          .inflate(R.layout.preference_wallpaper_type, null, false);
+    }
+}
commit	88110e21f6e6fb6ef352ba531c952b398ca3f078	[log] [tgz]
author	Daniel Nishi <dhnishi@google.com>	Tue Sep 27 16:45:10 2016 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Sep 27 16:45:14 2016 +0000
tree	1160aa3b40a80bf165d92c9948549a763d86f5ca
parent	13bdedb2090b83c59dba338ce4303a96c92bb6d1 [diff]
parent	355390da93be6859ee57fb8880fca9b0cf3d900d [diff]