diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index ff74324..989fc52 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nooit"</item>
-    <item msgid="5065465585332446709">"Ná 1 minuut"</item>
-    <item msgid="622807566366131941">"Ná 5 minute"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fe237d8..0a268e2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> persent ingeskryf"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Skryf tans vingerafdruk in <xliff:g id="PERCENTAGE">%d</xliff:g> persent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk bygevoeg"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Jy kan nou jou vingerafdruk gebruik om jou tablet te ontsluit of te verifieer dis jy, soos wanneer jy aanmeld by programme of ’n aankoop goedkeur"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Jy kan nou jou vingerafdruk gebruik om jou tablet te ontsluit of te verifieer dat dit jy is, soos wanneer jy by programme aanmeld"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Jy kan nou jou vingerafdruk gebruik om jou toestel te ontsluit of te verifieer dat dit jy is, soos wanneer jy by programme aanmeld"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Jy kan nou jou vingerafdruk gebruik om jou foon te ontsluit of te verifieer dat dit jy is, soos wanneer jy by programme aanmeld"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Ontsluit slegs wanneer skerm aan is"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Die skerm moet aan wees voordat jy met jou vingerafdruk kan ontsluit. Dit maak onbeplande ontsluiting minder waarskynlik."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skerm, ontsluit"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Geskiedenisdetails"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batterygebruik"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Bekyk gebruik in die afgelope 24 uur"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Bekyk gebruik sedert dit volgelaai is"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Bekyk gebruik sedert battery laas volgelaai is"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Programbatterygebruik"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Gebruikdetails"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Verstel kraggebruik"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Batterygebruik"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Sedert battery volgelaai is"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Bestuur batterygebruik"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Altesame <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> op agtergrond gebruik\nsedert dit laas volgelaai is"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Altesaam <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> op die agtergrond gebruik\nsedert battery laas volgelaai is"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Altesame <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> op agtergrond gebruik\nin afgelope 24 uur"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Altesame <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> op agtergrond gebruik\ntydens <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Altesame minder as \'n minuut sedert dit laas volgelaai is"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Altesaam minder as ’n minuut gebruik sedert battery laas volgelaai is"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Altesame minder as \'n minuut in afgelope 24 uur"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Totaal was minder as \'n minuut in <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Minder as \'n minuut op agtergrond gebruik sedert dit laas volgelaai is"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Minder as ’n minuut op die agtergrond gebruik sedert battery laas volgelaai is"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Minder as \'n minuut op agtergrond gebruik in afgelope 24 uur"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Minder as \'n minuut op agtergrond gebruik in <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Altesame <xliff:g id="TIME">^1</xliff:g> sedert dit laas volgelaai is"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Altesaam <xliff:g id="TIME">^1</xliff:g> gebruik sedert battery laas volgelaai is"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Altesame <xliff:g id="TIME">^1</xliff:g> in afgelope 24 uur"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Altesame <xliff:g id="TIME_0">^1</xliff:g> in <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> op agtergrond gebruik sedert dit laas volgelaai is"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> op die agtergrond gebruik sedert battery laas volgelaai is"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> op agtergrond gebruik in afgelope 24 uur"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> op agtergrond gebruik in <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Altesame <xliff:g id="TIME">^1</xliff:g> • minder as \'n minuut op agtergrond gebruik\nsedert dit laas volgelaai is"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Altesaam <xliff:g id="TIME">^1</xliff:g> • minder as ’n minuut op die agtergrond gebruik\nsedert battery laas volgelaai is"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Altesame <xliff:g id="TIME">^1</xliff:g> • minder as \'n minuut op agtergrond gebruik\nin afgelope 24 uur"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Altesame <xliff:g id="TIME_0">^1</xliff:g> • minder as \'n minuut op agtergrond gebruik\ntydens <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Geen gebruik sedert dit laas volgelaai is nie"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Geen gebruik sedert battery laas volgelaai is nie"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nie in afgelope 24 uur gebruik nie"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Ander gebruikers"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Vee <xliff:g id="USER_NAME">%1$s</xliff:g> van hierdie toestel af uit"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Sluitskerminstellings"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Voeg gebruikers van die sluitskerm af by"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Skakel oor na admingebruiker wanneer gedok"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Verwyder jouself?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Vee dié gebruiker uit?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Verwyder hierdie profiel?"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 30d6fb3..0650db6 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"በጭራሽ"</item>
-    <item msgid="5065465585332446709">"ከ1 ደቂቃ በኋላ"</item>
-    <item msgid="622807566366131941">"ከ5 ደቂቃዎች በኋላ"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e7af022..ba26a21 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"የእርስዎ የመልክ ሞዴል በቋሚነት እና ደህንነቱ በተጠበቀ መንገድ ይሰረዛል።\n\nከስረዛ በኋላ ስልክዎን ለመክፈት የእርስዎ ፒን፣ ስርዓተ-ጥለት ወይም የይለፍ ቃል ያስፈልገዎታል።"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"የእርስዎን ስልክ ለመክፈት በመልክ መክፈትን ይጠቀሙ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"የጣት አሻራ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"የጣት አሻራ መክፈቻን ሲጠቀሙ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"የጣት አሻራ ለሥራ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"የጣት አሻራዎችን ያስተዳድሩ"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"የጣት አሻራን ይጠቀሙ ለ"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"የተመዘገበ <xliff:g id="PERCENTAGE">%d</xliff:g> መቶኛ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"የጣት አሻራ <xliff:g id="PERCENTAGE">%d</xliff:g> መቶኛን በመመዝገብ ላይ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"የጣት አሻራ ታክሏል"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"የእርስዎን ጡባዊ ለመክፈት ወይም ለምሳሌ ወደ መተግበሪያዎች በመለያ ሲገቡ ወይም አንድን ግዢ ሲያጸድቁ እርስዎ መሆንዎን ለማረጋገጥ ከአሁን በኋላ የጣት አሻራዎን መጠቀም ይችላሉ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"አሁን የጣት አሻራዎትን የእርስዎን ጡባዊ ለመክፈት ወይም ለምሳሌ ወደ መተግበሪያዎች በሚገቡበት ጊዜ እርስዎ መሆንዎትን ለማረጋገጥ ሊጠቀሙበት ይችላሉ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"አሁን የጣት አሻራዎትን የእርስዎን መሣሪያ ለመክፈት ወይም ለምሳሌ ወደ መተግበሪያዎች በሚገቡበት ጊዜ እርስዎ መሆንዎትን ለማረጋገጥ ሊጠቀሙበት ይችላሉ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"አሁን የጣት አሻራዎትን የእርስዎን ስልክ ለመክፈት ወይም ለምሳሌ ወደ መተግበሪያዎች በሚገቡበት ጊዜ እርስዎ መሆንዎትን ለማረጋገጥ ሊጠቀሙበት ይችላሉ"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ማያ ገጽ ሲበራ ብቻ ይክፈቱ"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"በጣት አሻራዎ ከመክፈትዎ በፊት ማያ ገጹ ክፍት መሆን አለበት። ይህ በስህተት የመከፈትን ዕድል ይቀንሳል።"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ማያ ገጽ፣ ይክፈቱ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"በኋላ ላይ ያድርጉት"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ያንሱ፣ በመቀጠል መልሰው ይንኩ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"የጣት አሻራዎን ጎን በዳሳሹ ላይ አስቀምጠው ይያዙት፣ ከዚያ ወደ ሌላኛው ጎን ይቀይሩ"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"የመኝታ ሰዓት ሁነታ ስለበራ የማይገኝ"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"የማያ ገጽ አዳኝን ይጠቀሙ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"ኃይል እየሞላ ወይም ተተክሎ ሳለ"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ተተክሎ እና ኃይል በመሙላት ላይ እያለ"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"ባትሪ በመሙላት ላይ ሳለ"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ተተክሎ ሳለ"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"በጭራሽ"</string>
@@ -2814,7 +2811,8 @@
     <string name="history_details_title" msgid="8628584613889559355">"የታሪክ ዝርዝሮች"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"የባትሪ አጠቃቀም"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ያለፉት 24 ሰዓቶች አጠቃቀምን ይመልከቱ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ካለፈው የተሞላ ኃይል የአጠቃቀም ታሪክ ይመልከቱ"</string>
+    <!-- no translation found for advanced_battery_preference_summary (2372763700477268393) -->
+    <skip />
     <string name="battery_details_title" msgid="3289680399291090588">"የመተግበሪያ የባትሪ አጠቃቀም"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ዝርዝሮችን ተጠቀም"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"የኃይል አጠቃቀም አስተካክል"</string>
@@ -2995,25 +2993,32 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"የባትሪ አጠቃቀም"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"የባትሪው ኃይል ሙሉ ከሆነ በኋላ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"የባትሪ አጠቃቀምን ያቀናብሩ"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> ጠቅላላ • ከመጨረሻው ሙሉ ኃይል\nሙሌት በኋላ <xliff:g id="TIME_1">^2</xliff:g> ዳራ"</string>
+    <!-- no translation found for battery_total_and_bg_usage (8435738393326063685) -->
+    <skip />
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> ጠቅላላ • ላለፉት 24 ሰዓታት\n<xliff:g id="TIME_1">^2</xliff:g> ዳራ"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> ጠቅላላ • የ<xliff:g id="TIME_1">^2</xliff:g> ዳራ\nለ<xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"ከመጨረሻው ሙሉ የኃይል ሙሌት በኋላ ጠቅላላ ከአንድ ደቂቃ ያነሰ"</string>
+    <!-- no translation found for battery_total_usage_less_minute (3199193389086828320) -->
+    <skip />
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ላለፉት 24 ሰዓቶች ጠቅላላ ከአንድ ደቂቃ ያነሰ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"ለ<xliff:g id="TIME_PERIOD">^1</xliff:g> ጠቅላላ ከአንድ ደቂቃ"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ከመጨረሻው ሙሉ የኃይል ሙሌት በኋላ ከአንድ ደቂቃ ያነሰ ዳራ"</string>
+    <!-- no translation found for battery_bg_usage_less_minute (7776884932074493406) -->
+    <skip />
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ላለፉት 24 ሰዓታት ዳራ ከአንድ ደቂቃ በታች"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"ለ<xliff:g id="TIME_PERIOD">^1</xliff:g> ዳራ ከአንድ ደቂቃ በታች"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> ጠቅላላ ከመጨረሻው ሙሉ ኃይል ሙሌት በኋላ"</string>
+    <!-- no translation found for battery_total_usage (4811532932663354619) -->
+    <skip />
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ላለፉት 24 ሰዓታት <xliff:g id="TIME">^1</xliff:g> ጠቅላላ"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"ለ<xliff:g id="TIME_PERIOD">^2</xliff:g> ጠቅላላ <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"ከመጨረሻው ሙሉ ኃይል ሙሌት በኋላ <xliff:g id="TIME">^1</xliff:g> ዳራ"</string>
+    <!-- no translation found for battery_bg_usage (8262917746299259350) -->
+    <skip />
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ላለፉት 24 ሰዓታት የ<xliff:g id="TIME">^1</xliff:g> ዳራ"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"ለ<xliff:g id="TIME_PERIOD">^2</xliff:g> የ<xliff:g id="TIME_0">^1</xliff:g> ዳራ"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> ጠቅላላ • ከመጨረሻው ሙሉ ኃይል ሙሌት በኋላ\nዳራ ከአንድ ደቂቃ ያነሰ"</string>
+    <!-- no translation found for battery_total_usage_and_bg_less_minute_usage (3861884807364163833) -->
+    <skip />
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> ጠቅላላ • ላለፉት 24 ሰዓታት\nዳራ ከአንድ ደቂቃ በታች"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> ጠቅላላ • ለ<xliff:g id="TIME_PERIOD">^2</xliff:g>\nዳራ ከአንድ ደቂቃ በታች"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ካለፈው ሙሉ ኃይል ሙሌት በኋላ ጥቅም ላይ አልዋለም"</string>
+    <!-- no translation found for battery_not_usage (3851536644733662392) -->
+    <skip />
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ላለፉት 24 ሰዓታት ጥቅም ላይ አልዋለም"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ሌሎች ተጠቃሚዎች"</string>
@@ -3493,7 +3498,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g>ን ከዚህ መሣሪያ ሰርዝ"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"የገጽ ቆልፍ ቅንብሮች"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ከማያ ገጽ ቁልፍ ሆነው ተጠቃሚዎችን ያክሉ"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"በሚተከልበት ጊዜ ወደ የአስተዳዳሪ ተጠቃሚ ይቀይሩ"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"እራስዎን ይሰርዙ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ይህ ተጠቃሚ ይሰረዝ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ይህ መገለጫ ይወገድ?"</string>
@@ -4206,8 +4212,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"በጥያቄዎ መሠረት Android የዚህ መተግበሪያ ማሳወቂያዎች በዚህ መሣሪያ ላይ እንዳይታዩ እያገደ ነው"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"በጥያቄዎ መሠረት Android ይህ የማሳወቂያዎች ምድብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"በጥያቄዎ መሠረት Android ይህን የማሳወቂያዎች ስብስብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"ይህ መተግበሪያ ማሳወቂያዎችን አይልክም"</string>
     <string name="notification_channels" msgid="1502969522886493799">"ምድቦች"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"ሌላ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 75cf024..6b1e7c2 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"أبدًا"</item>
-    <item msgid="5065465585332446709">"بعد دقيقة واحدة"</item>
-    <item msgid="622807566366131941">"بعد 5 دقائق"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 34848a2..b937c75 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -465,8 +465,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"سيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد حذفه، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"استخدام ميزة \"فتح الجهاز بالتعرف على الوجه\" لفتح قفل هاتفك"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"بصمة الإصبع"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"عند استخدام ميزة \"فتح الجهاز ببصمة الإصبع\""</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"بصمة الإصبع للملف الشخصي للعمل"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"إدارة بصمات الإصبع"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"استخدام بصمة الإصبع في"</string>
@@ -605,16 +604,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"اكتملت عملية التسجيل بنسبة <xliff:g id="PERCENTAGE">%d</xliff:g> في المئة."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"تسجيل بصمة الإصبع <xliff:g id="PERCENTAGE">%d</xliff:g> في المئة."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"تمت إضافة بصمة الإصبع"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"يمكنك الآن استخدام بصمة إصبعك لفتح قفل جهازك اللوحي أو إثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات أو الموافقة على عملية شراء."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"يمكنك الآن استخدام بصمة إصبعك لفتح قفل جهازك اللوحي أو إثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"يمكنك الآن استخدام بصمة إصبعك لفتح قفل جهازك أو إثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"يمكنك الآن استخدام بصمة إصبعك لفتح قفل هاتفك أو إثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"فتح قفل الشاشة عندما تكون مفعَّلة فقط"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"يجب تفعيل الشاشة قبل أن تتمكن من فتح قفلها ببصمة إصبعك. يؤدي هذا إلى تقليل احتمال فتح قفل الشاشة بدون قصد."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"فتح قفل الشاشة"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"تنفيذ ذلك لاحقًا"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ارفع إصبعك ثم المس المستشعر مرة أخرى"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"ضع جانب بصمة الإصبع على المستشعر واضغط مع الاستمرار ثم بدِّل إلى الجانب الآخر."</string>
@@ -1603,8 +1601,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"الميزة غير متاحة لأن وضع \"وقت النوم\" مفعّل."</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"استخدام شاشة الاستراحة"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"أثناء الشحن أو الإرساء"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"أثناء الإرساء والشحن"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"أثناء الشحن"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"أثناء الإرساء"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"عدم التشغيل أبدًا"</string>
@@ -2938,7 +2935,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"تفاصيل السجل"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"استخدام البطارية"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"بيانات استخدام البطارية خلال آخر 24 ساعة"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"عرض استخدام البطارية منذ آخر شحن كامل"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"الاطّلاع على الاستخدام منذ آخر شحن كامل"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"استخدام التطبيق للبطارية"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"استخدام التفاصيل"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ضبط استخدام الطاقة"</string>
@@ -3147,25 +3144,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"استخدام البطارية"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"منذ اكتمال الشحن"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"إدارة استخدام البطارية"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"إجمالي مدة الاستخدام: <xliff:g id="TIME_0">^1</xliff:g> • تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME_1">^2</xliff:g>\nمنذ آخر عملية شحن كاملة"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"إجمالي مدة الاستخدام: <xliff:g id="TIME_0">^1</xliff:g> • تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME_1">^2</xliff:g>\nمنذ آخر عملية شحن كاملة."</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"إجمالي مدة الاستخدام: <xliff:g id="TIME_0">^1</xliff:g> • تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME_1">^2</xliff:g>\nفي آخر 24 ساعة"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"إجمالي مدة الاستخدام: <xliff:g id="TIME_0">^1</xliff:g> • تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME_1">^2</xliff:g>\nفي الفترة <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"الاستخدام الإجمالي للبطارية أقل من دقيقة منذ آخر عملية شحن كاملة."</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"الاستخدام الإجمالي للبطارية أقل من دقيقة منذ آخر عملية شحن كاملة."</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"الاستخدام الإجمالي للبطارية أقل من دقيقة في آخر 24 ساعة."</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"الاستخدام الإجمالي للبطارية أقل من دقيقة في الفترة <xliff:g id="TIME_PERIOD">^1</xliff:g>."</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"تم استخدام البطارية في الخلفية أقل من دقيقة منذ آخر عملية شحن كاملة."</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"تم استخدام البطارية في الخلفية أقل من دقيقة منذ آخر عملية شحن كاملة."</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"تم استخدام البطارية في الخلفية أقل من دقيقة في آخر 24 ساعة."</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"تم استخدام البطارية في الخلفية أقل من دقيقة في الفترة <xliff:g id="TIME_PERIOD">^1</xliff:g>."</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"الاستخدام الإجمالي للبطارية منذ آخر عملية شحن كاملة: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"الاستخدام الإجمالي للبطارية منذ آخر عملية شحن كاملة: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"الاستخدام الإجمالي للبطارية في آخر 24 ساعة: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"الاستخدام الإجمالي للبطارية <xliff:g id="TIME_0">^1</xliff:g> في الفترة <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME">^1</xliff:g> منذ آخر عملية شحن كاملة."</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> منذ آخر عملية شحن كاملة"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME">^1</xliff:g> في آخر 24 ساعة."</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"تم استخدام البطارية في الخلفية لمدة <xliff:g id="TIME_0">^1</xliff:g> في الفترة <xliff:g id="TIME_PERIOD">^2</xliff:g>."</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"إجمالي مدة الاستخدام: <xliff:g id="TIME">^1</xliff:g> • تم استخدام البطارية في الخلفية أقل من دقيقة\nمنذ آخر عملية شحن كاملة"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"إجمالي مدة الاستخدام: <xliff:g id="TIME">^1</xliff:g> • تم استخدام البطارية في الخلفية أقل من دقيقة\nمنذ آخر عملية شحن كاملة."</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"إجمالي مدة الاستخدام: <xliff:g id="TIME">^1</xliff:g> • تم استخدام البطارية في الخلفية أقل من دقيقة\nفي آخر 24 ساعة."</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"إجمالي مدة الاستخدام: <xliff:g id="TIME_0">^1</xliff:g> • تم استخدام البطارية في الخلفية أقل من دقيقة\nفي الفترة <xliff:g id="TIME_PERIOD">^2</xliff:g>."</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"لم يتم استخدام البطارية منذ آخر عملية شحن كاملة."</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"لم يتم استخدام البطارية منذ آخر عملية شحن كاملة."</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"لم يتم استخدام البطارية في آخر 24 ساعة."</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"مستخدمون آخرون"</string>
@@ -3661,7 +3658,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> من هذا الجهاز"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"إعدادات شاشة القفل"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"إضافة المستخدمين من شاشة القفل"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"التبديل إلى المستخدم المشرف عند إرساء الجهاز"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"هل تريد حذف نفسك؟"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"هل تريد حذف هذا المستخدم؟"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"هل تريد حذف هذا الملف الشخصي؟"</string>
@@ -4398,8 +4396,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏بناءً على طلبك، يمنع Android ظهور إشعارات هذا التطبيق على هذا الجهاز."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏بناءً على طلبك، يمنع Android ظهور هذه الفئة من الإشعارات على هذا الجهاز."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏بناءً على طلبك، يمنع Android ظهور هذه المجموعة من الإشعارات على هذا الجهاز."</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"لا يُرسِل هذا التطبيق إشعارات."</string>
     <string name="notification_channels" msgid="1502969522886493799">"الفئات"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"غير ذلك"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -6230,8 +6227,8 @@
     <string name="dream_complications_toggle_title" msgid="4273232303027449163">"إظهار معلومات إضافية"</string>
     <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"يتم عرض الوقت أو الطقس أو غير ذلك من المعلومات على شاشة الاستراحة."</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"إعدادات إضافية"</string>
-    <string name="dream_setup_title" msgid="2458303874255396142">"اختيار شاشة التوقف"</string>
-    <string name="dream_setup_description" msgid="7508547154038580296">"اختَر ما يظهر لك على شاشتك عندما يكون جهازك اللوحي في حالة إرساء. قد يستهلك جهازك قدرًا أكبر من الطاقة عند استخدام شاشة توقّف."</string>
+    <string name="dream_setup_title" msgid="2458303874255396142">"اختيار شاشة الاستراحة"</string>
+    <string name="dream_setup_description" msgid="7508547154038580296">"اختَر ما تريد أن يظهر على شاشتك عندما يكون جهازك اللوحي في حالة إرساء. قد يستهلك جهازك قدرًا أكبر من الطاقة عند استخدام شاشة الاستراحة."</string>
     <string name="customize_button_title" msgid="1110284655990203359">"تخصيص"</string>
     <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"يجب إعادة التشغيل لتفعيل النوافذ الحرة."</string>
     <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"يجب إعادة التشغيل لفرض وضع الكمبيوتر المكتبي على الشاشات الثانوية."</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 3464b56..de72b39 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"কেতিয়াও নহয়"</item>
-    <item msgid="5065465585332446709">"১ মিনিটৰ পাছত"</item>
-    <item msgid="622807566366131941">"৫ মিনিটৰ পাছত"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f0106df..ffa4abd 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"আপোনাৰ মুখাৱয়বৰ ম\'ডেলটো স্থায়ী তথা সুৰক্ষিতভাৱে মচা হ’ব।\n\nমচাৰ পাছত, ফ’নটো আনলক কৰিবলৈ আপোনাক নিজৰ পিন, আৰ্হি অথবা পাছৱৰ্ডৰ প্ৰয়োজন হ’ব।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"আপোনাৰ ফ’নটো আনলক কৰিবলৈ ফেচ আনলক ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ফিংগাৰপ্ৰিণ্ট"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ফিংগাৰপ্ৰিন্ট আনলক ব্যৱহাৰ কৰাৰ সময়ত"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"কৰ্মস্থানৰ ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ফিংগাৰপ্ৰিণ্টসমূহ পৰিচালনা কৰক"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ পঞ্জীয়ন কৰা হৈছে"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ফিংগাৰপ্ৰিণ্ট <xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ পঞ্জীয়ন কৰা হ\'ল"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ফিংগাৰপ্ৰিণ্ট যোগ কৰা হ’ল"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"এতিয়া আপুনি নিজৰ টেবলেটটো আনলক কৰোঁতে অথবা আপুনি এপত ছাইন ইন কৰা অথবা কোনো ক্ৰয়ৰ অনুমোদন জনোৱা আদিৰ দৰে কাৰ্য কৰোঁতে এয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"এতিয়া আপুনি নিজৰ টেবলেটটো আনলক কৰিবলৈ অথবা এপত ছাইন ইন কৰাৰ দৰে কাৰ্য কৰোঁতে এয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"এতিয়া আপুনি নিজৰ ডিভাইচটো আনলক কৰিবলৈ অথবা এপত ছাইন ইন কৰাৰ দৰে কাৰ্য কৰোঁতে এয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"এতিয়া আপুনি নিজৰ ফ’নটো আনলক কৰিবলৈ অথবা এপত ছাইন ইন কৰাৰ দৰে কাৰ্য কৰোঁতে এয়া আপুনিয়েই বুলি সত্যাপন কৰিবলৈ নিজৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব পাৰে"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"কেৱল স্ক্ৰীন অন হৈ থকা অৱস্থাত আনলক কৰক"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ জৰিয়তে আনলক কৰিব পৰা হোৱাৰ পূৰ্বে স্ক্ৰীনখন অন হৈ থাকিবই লাগিব। এইটোৱে ভুলতে আনলক হোৱাৰ সম্ভাৱনা কম কৰে।"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"স্ক্ৰীন, আনলক কৰা আছে"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"এইটো পাছত কৰিব"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ওপৰলৈ উঠাওক, তাৰ পাছত পুনৰ স্পৰ্শ কৰক"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ কাষটো ছেন্সৰটোত ৰাখি অলপ সময় ধৰি থাকক, তাৰ পাছত আনটো কাষ ৰাখক"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"বেডটাইম ম’ড অন হৈ থকাৰ বাবে উপলব্ধ নহয়"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"স্ক্ৰীন ছেভাৰ ব্যৱহাৰ কৰক"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"চাৰ্জ কৰোঁতে বা ডক কৰি থওঁতে"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ড’ক কৰি থোৱা আৰু চাৰ্জিঙৰ সময়ত"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"চাৰ্জ কৰি থকাৰ সময়ত"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ডক হৈ থাকোঁতে"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"কেতিয়াও নহয়"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ইতিহাসৰ বিৱৰণ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"বেটাৰীৰ ব্যৱহাৰ"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"যোৱা ২৪ ঘণ্টাত হোৱা ব্যৱহাৰ চাওক"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"অন্তিমবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পাছত হোৱা ব্যৱহাৰ চাওক"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত হোৱা ব্যৱহাৰ চাওক"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"এপৰ বেটাৰীৰ ব্যৱহাৰ"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ব্যৱহাৰৰ বিৱৰণ"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"পাৱাৰৰ ব্যৱহাৰ খাপ খুৱাওক"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"বেটাৰীৰ ব্যৱহাৰ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"সম্পূৰ্ণ চ্চাৰ্জ হোৱাৰ পাছত"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"বেটাৰীৰ ব্যৱহাৰ পৰিচালনা কৰক"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"মুঠ <xliff:g id="TIME_0">^1</xliff:g> • শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা মুঠ\n<xliff:g id="TIME_1">^2</xliff:g>"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"মুঠ <xliff:g id="TIME_0">^1</xliff:g> • অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত নেপথ্যত <xliff:g id="TIME_1">^2</xliff:g>\n"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"মুঠ <xliff:g id="TIME_0">^1</xliff:g> • যোৱা ২৪ ঘণ্টাত নেপথ্যত\n<xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"মুঠ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> সময়খিনিত নেপথ্যত\n<xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা মুঠ এক মিনিটতকৈ কম সময়"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা মুঠ এক মিনিটতকৈ কম সময়"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"যোৱা ২৪ ঘণ্টাত মুঠ এক মিনিটতকৈ কম সময়"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> সময়খিনিত মুঠ এক মিনিটতকৈ কম সময়"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা নেপথ্যত এক মিনিটতকৈ কম সময়"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা নেপথ্যত এক মিনিটতকৈ কম সময়"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"যোৱা ২৪ ঘণ্টাত নেপথ্যত এক মিনিটতকৈ কম সময়"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> সময়খিনিত নেপথ্যত এক মিনিটতকৈ কম সময়"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা মুঠ <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত মুঠ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"যোৱা ২৪ ঘণ্টাত মুঠ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> সময়খিনিত মুঠ <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা নেপথ্যত <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত <xliff:g id="TIME">^1</xliff:g> নেপথ্যত"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"যোৱা ২৪ ঘণ্টাত <xliff:g id="TIME">^1</xliff:g> সময় নেপথ্যত"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> সময়খিনিত নেপথ্যত <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"মুঠ <xliff:g id="TIME">^1</xliff:g> • শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা\nএক মিনিটতকৈ কম সময়"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"মুঠ <xliff:g id="TIME">^1</xliff:g> • অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত\nএক মিনিটতকৈ কম সময়"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"মুঠ <xliff:g id="TIME">^1</xliff:g> • যোৱা ২৪ ঘণ্টাত নেপথ্যত\nএক মিনিটতকৈ কম সময়"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"মুঠ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> সময়খিনিত নেপথ্যত\nএক মিনিটতকৈ কম সময়"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"শেষবাৰ সম্পূৰ্ণ চাৰ্জ হোৱাৰ পৰা ব্যৱহাৰ কৰা নাই"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত ব্যৱহাৰ হোৱা নাই"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"যোৱা ২৪ ঘণ্টাত ব্যৱহাৰ কৰা নাই"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"অন্য ব্যৱহাৰকাৰী"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"এই ডিভাইচৰ পৰা <xliff:g id="USER_NAME">%1$s</xliff:g>ক মচক"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"লক স্ক্ৰীনৰ ছেটিং"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"লক স্ক্ৰীনৰ পৰা নতুন ব্যৱহাৰকাৰী যোগ দিয়ক"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ডক কৰিলে প্ৰশাসক ব্যৱহাৰকাৰীলৈ সলনি কৰক"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"নিজেই মচিবনে?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"এই ব্যৱহাৰকাৰীজন মচিবনে?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"এই প্ৰ\'ফাইলটো আঁতৰাইনে?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপোনাৰ অনুৰোধত অনুযায়ী Android-এ এই এপ্‌‌টোৰ জাননীসমূহ এই ডিভাইচটোত দেখুওৱাত বাধা দিছে"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই শ্ৰেণীটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই গোটটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"এই এপ্‌টোৱে জাননী নপঠায়"</string>
     <string name="notification_channels" msgid="1502969522886493799">"শ্ৰেণী"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"অন্যান্য"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 4cad023..d7438fb 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Heç vaxt"</item>
-    <item msgid="5065465585332446709">"1 dəqiqə sonra"</item>
-    <item msgid="622807566366131941">"5 dəqiqə sonra"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 330495c..18550ed 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Üz modeliniz həmişəlik və təhlükəsiz qaydada silinəcək.\n\nSilindikdən sonra telefonu kiliddən çıxarmaq üçün PIN, model və ya parol tələb ediləcək."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Telefonu kiliddən çıxarmaq üçün Üz ilə kiliddən çıxarmadan istifadə edin"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Barmaq izi"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Barmaq izi ilə kiliddən çıxarma istifadə edərkən"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"İş üçün barmaq izi"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Barmaq izlərini idarə edin"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Bunun üçün barmaq izi istifadə edin:"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> faiz qeydiyyatdan keçib"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Barmaq izi qeydiyyatı: <xliff:g id="PERCENTAGE">%d</xliff:g> faiz"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Barmaq izi əlavə edildi"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"İndi tətbiqlərə daxil olmaq və ya alışı təsdiqləmək kimi hallarda planşeti kiliddən çıxarmaq və ya kimlik doğrulaması üçün barmaq izinizdən istifadə edə bilərsiniz"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"İndi tətbiqlərə daxil olmaq kimi hallarda planşeti kiliddən çıxarmaq və ya kimlik doğrulaması üçün barmaq izinizdən istifadə edə bilərsiniz"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"İndi tətbiqlərə daxil olmaq kimi hallarda cihazı kiliddən çıxarmaq və ya kimlik doğrulaması üçün barmaq izinizdən istifadə edə bilərsiniz"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"İndi tətbiqlərə daxil olmaq kimi hallarda telefonu kiliddən çıxarmaq və ya kimlik doğrulaması üçün barmaq izinizdən istifadə edə bilərsiniz"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Yalnız ekran aktiv olduqda kiliddən çıxarın"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Barmaq izinizlə kiliddən çıxarmadan əvvəl ekran aktiv olmalıdır. Bu, təsadüfən kiliddən çıxarılma ehtimalını azaldır."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekranı kiliddən çıxarma"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Sonraya saxlayın"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Qaldırın və təkrar toxunun"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Barmaq izinizin yan tərəfini sensora yerləşdirib saxlayın, sonra digər tərəfə keçin"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Yuxu vaxtı rejimi aktiv olduğu üçün əlçatan deyil"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Ekran qoruyucusundan istifadə edin"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Şarj ərzində və ya dok-stansiyada"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Dokda olduqda və şarj edildikdə"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Şarj ərzində"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Dok-stansiyada"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Heç vaxt"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Tarixçə detalları"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Enerji istifadəsi"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Son 24 saat ərzində istifadəyə baxın"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Son tam şarjdan sonra istifadəyə baxın"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Son tam şarjdan sonra istifadəyə baxın"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Tətbiq batareyasının istifadəsi"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Ətraflı istifadə"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Enerji istifadəsini idarə edin"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Enerji istifadəsi"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Tam şarjdan sonra"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Enerji sərfiyyatının idarəedilməsi"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Cəmi <xliff:g id="TIME_0">^1</xliff:g> • Sonuncu tam şarjdan etibarən\n<xliff:g id="TIME_1">^2</xliff:g> arxa fon"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Cəmi <xliff:g id="TIME_0">^1</xliff:g> • Son tam şarjdan\nsonra <xliff:g id="TIME_1">^2</xliff:g> arxa fon"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Cəmi <xliff:g id="TIME_0">^1</xliff:g> • son 24 saat ərzində\n<xliff:g id="TIME_1">^2</xliff:g> arxa fon"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Cəmi <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> ərzində\n<xliff:g id="TIME_1">^2</xliff:g> arxa fon"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Sonuncu tam şarjdan etibarən cəmi bir dəqiqədən az"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Son tam şarjdan sonra cəmi bir dəqiqədən az"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Son 24 saat ərzində cəmi bir dəqiqədən az"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ərzində cəmi bir dəqiqədən az"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Sonuncu tam şarjdan etibarən bir dəqiqədən az arxa fon"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Son tam şarjdan sonra bir dəqiqədən az arxa fon"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Son 24 saat ərzində bir dəqiqədən az arxa fon"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ərzində bir dəqiqədən az arxa fon"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Sonuncu tam şarjdan etibarən cəmi <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Son tam şarjdan sonra cəmi <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Son 24 saat ərzində cəmi <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ərzində cəmi <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Sonuncu tam şarjdan etibarən <xliff:g id="TIME">^1</xliff:g> arxa fon"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Son tam şarjdan sonra <xliff:g id="TIME">^1</xliff:g> arxa fon"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Son 24 saat ərzində <xliff:g id="TIME">^1</xliff:g> arxa fon"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ərzində <xliff:g id="TIME_0">^1</xliff:g> arxa fon"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Cəmi <xliff:g id="TIME">^1</xliff:g> • sonuncu tam şarjdan etibarən\nbir dəqiqədən az arxa fon"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Cəmi <xliff:g id="TIME">^1</xliff:g> • Son tam şarjdan sonra bir\ndəqiqədən az arxa fon"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Cəmi <xliff:g id="TIME">^1</xliff:g> • son 24 saat ərzində bir dəqiqədən az\narxa fon"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Cəmi <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> ərzində bir dəqiqədən az\narxa fon"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Sonuncu tam şarjdan etibarən istifadə edilməyib"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Son tam şarjdan sonra istifadə olunmayıb"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Son 24 saat ərzində istifadə edilməyib"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Digər istifadəçilər"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> adlı istifadəçini bu cihazdan silin"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Ekran ayarlarını kilidləyin"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Kilid ekranından istifadəçi əlavə edin"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Doka yerləşdirildikdə admin istifadəçiyə keçin"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Özünüzü silirsiniz?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Bu istifadəçi silinsin?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Bu profil silinsin?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Bu kateqoriya bildirişləri deaktivdir."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Bu kateqoriya bildirişləri deaktivdir."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Bu kateqoriya bildirişləri deaktivdir."</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Bu tətbiq bildiriş göndərmir"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kateqoriyalar"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Digər"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index d2b9f1a..5920c21 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nikad"</item>
-    <item msgid="5065465585332446709">"Posle 1 minuta"</item>
-    <item msgid="622807566366131941">"Posle 5 minuta"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 58f55b2..3b3ae15 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -456,8 +456,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Model lica će biti trajno i bezbedno izbrisan.\n\nPosle brisanja vam treba PIN, šablon ili lozinka da biste otključali telefon."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Otključajte telefon licem"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Otisak prsta"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Kada se koristi otključavanje otiskom prsta"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Otisak prsta za posao"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Upravljaj otis. prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Koristi otis. prsta za"</string>
@@ -593,16 +592,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Registrovano je <xliff:g id="PERCENTAGE">%d</xliff:g> posto"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrovanje otiska prsta je na <xliff:g id="PERCENTAGE">%d</xliff:g> posto"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisak prsta je dodat"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Sada možete da koristite otisak prsta za otključavanje tableta ili potvrdu identiteta, na primer, kad se prijavljujete u aplikacije ili odobravate kupovinu"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Sada možete da koristite otisak prsta za otključavanje tableta ili potvrdu identiteta, na primer, kad se prijavljujete u aplikacije"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Sada možete da koristite otisak prsta za otključavanje uređaja ili potvrdu identiteta, na primer, kad se prijavljujete u aplikacije"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Sada možete da koristite otisak prsta za otključavanje telefona ili potvrdu identiteta, na primer, kad se prijavljujete u aplikacije"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Otključavanje samo kada je ekran uključen"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ekran mora da bude uključen da biste mogli da otključate otiskom prsta. To smanjuje verovatnoću za slučajno otključavanje."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekran, otključavanje"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Uradiću to kasnije"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Podignite, pa opet dodirnite"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Stavite jednu stranu prsta na senzor i zadržite, pa stavite drugu stranu"</string>
@@ -2844,7 +2842,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalji istorije"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Potrošnja baterije"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Pogledajte korišćenja u poslednja 24 sata"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Korišćenje od poslednjeg potpunog punjenja"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Pregledajte upotrebu od poslednjeg punjenja"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Potrošnja baterije za aplikacije"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Korišćenje detalja"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Prilagođavanje korišćenja napajanja"</string>
@@ -3032,25 +3030,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Potrošnja baterije"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od potpunog punjenja"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Upravljanje potrošnjom baterije"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> korišćenja u pozadini\nod poslednjeg potpunog punjenja"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> korišćenja u pozadini\nod poslednjeg potpunog punjenja"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> korišćenja u pozadini\nu poslednja 24 sata"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> korišćenja u pozadini\nu periodu <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Ukupno manje od minuta od poslednjeg potpunog punjenja"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Ukupno manje od minuta od poslednjeg potpunog punjenja"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Ukupno manje od minuta u poslednja 24 sata"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Ukupno manje od minuta u periodu <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Manje od minuta korišćenja u pozadini od poslednjeg potpunog punjenja"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Manje od minuta korišćenja u pozadini od poslednjeg potpunog punjenja"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Manje od minuta korišćenja u pozadini u poslednja 24 sata"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Manje od minuta korišćenja u pozadini u periodu: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Ukupno <xliff:g id="TIME">^1</xliff:g> od poslednjeg potpunog punjenja"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Ukupno <xliff:g id="TIME">^1</xliff:g> od poslednjeg potpunog punjenja"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Ukupno <xliff:g id="TIME">^1</xliff:g> u poslednja 24 sata"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> u periodu <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> korišćenja u pozadini od poslednjeg potpunog punjenja"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> korišćenja u pozadini od poslednjeg potpunog punjenja"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> korišćenja u pozadini u poslednja 24 sata"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> korišćenja u pozadini u periodu: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Ukupno <xliff:g id="TIME">^1</xliff:g> • Manje od minuta korišćenja u pozadini\nod poslednjeg potpunog punjenja"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Ukupno <xliff:g id="TIME">^1</xliff:g> • manje od minuta korišćenja u pozadini\nod poslednjeg potpunog punjenja"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Ukupno <xliff:g id="TIME">^1</xliff:g> • Manje od minuta korišćenja u pozadini\nu poslednja 24 sata"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • Manje od minuta korišćenja u pozadini\nu periodu <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nema korišćenja od poslednjeg potpunog punjenja"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nije bilo korišćenja od poslednjeg potpunog punjenja"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nema korišćenja u poslednja 24 sata"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Ostali korisnici"</string>
@@ -3534,7 +3532,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Izbriši <xliff:g id="USER_NAME">%1$s</xliff:g> sa uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Podešavanja zaključanog ekrana"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Dodaj korisnike sa zaključanog ekrana"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Pređi na administratora na baznoj stanici"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Želite li da izbrišete sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Brišete ovog korisnika?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Uklanjate ovaj profil?"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 7fa48b0..266e1a3 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Ніколі"</item>
-    <item msgid="5065465585332446709">"Праз 1 хвіліну"</item>
-    <item msgid="622807566366131941">"Праз 5 хвілін"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index db813f8..62a8a20 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Мадэль вашага твару будзе канчаткова і бяспечна выдалена.\n\nПасля гэтага для разблакіроўкі тэлефона трэба будзе выкарыстоўваць PIN-код, узор разблакіроўкі ці пароль."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Выкарыстанне функцыі распазнавання твару для разблакіроўкі тэлефона"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Адбітак пальца"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Пры выкарыстанні разблакіроўкі адбіткам пальца"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Адбітак пальца (праца)"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Кірав. адбіт. пальцаў"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Выкарыст. адбітак для"</string>
@@ -599,16 +598,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Адбітак пальца дададзены"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Цяпер вы можаце выкарыстоўваць функцыю распазнавання адбіткаў пальца для разблакіроўкі планшэта ці спраўджання вашай асобы, напрыклад падчас уваходу ў праграмы ці ўхвалення куплі"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Цяпер вы можаце выкарыстоўваць адбітак пальца для разблакіроўкі планшэта ці спраўджання сваёй асобы, напрыклад падчас уваходу ў праграмы"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Цяпер вы можаце выкарыстоўваць адбітак пальца для разблакіроўкі прылады ці спраўджання сваёй асобы, напрыклад падчас уваходу ў праграмы"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Цяпер вы можаце выкарыстоўваць адбітак пальца для разблакіроўкі тэлефона ці спраўджання сваёй асобы, напрыклад падчас уваходу ў праграмы"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Разблакіраваць толькі пры ўключаным экране"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Неабходна ўключыць экран, каб разблакіраваць яго адбіткам пальца. Гэта змяншае імавернасць выпадковай разблакіроўкі."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Разблакіроўка экрана"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Пазней"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Падніміце і дакраніцеся зноў"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Прыкладзіце палец да датчыка адным бокам і ўтрымлівайце яго, потым павярніце іншым бокам"</string>
@@ -1565,8 +1563,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Недаступна, бо ўключаны начны рэжым"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Ужываць экранную застаўку"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Пакуль прылада зараджаецца ці падключана"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Калі на док-станцыі і ў час зарадкі"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Падчас зарадкі"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Пры падключэнні"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Ніколі"</string>
@@ -2878,7 +2875,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Падрабязнасці гісторыі"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Выкарыстанне зараду"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Выкарыстанне за апошнія 24 гадзіны"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Выкарыстанне з моманту поўнай зарадкі"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Ужыванне пасля апошняй поўнай зарадкі"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Выкарыстанне зараду праграмамі"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Падрабязнасці выкарыстання"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Адрэгуляваць спажыванне энергіі"</string>
@@ -3073,25 +3070,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Выкарыстанне зараду"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"З моманту поўнай зарадкі"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Кіраваць выкарыстаннем зараду"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Усяго <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> працы ў фонавым рэжыме\nз моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Усяго <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> працы ў фонавым рэжыме\nз моманту апошняй поўнай зарадкі"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Усяго <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> працы ў фонавым рэжыме\nза апошнія 24 гадз"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Усяго <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> у фонавым рэжыме\nза перыяд <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Усяго менш чым хвіліна працы з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Усяго менш за хвіліну працы з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Усяго менш чым хвіліна працы за апошнія 24 гадз"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Усяго менш чым хвіліна працы за перыяд <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Менш чым хвіліна працы ў фонавым рэжыме з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Менш за хвіліну працы ў фонавым рэжыме з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Менш чым хвіліна працы ў фонавым рэжыме за апошнія 24 гадз"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Менш чым хвіліна працы ў фонавым рэжыме за перыяд <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Усяго <xliff:g id="TIME">^1</xliff:g> працы з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Усяго <xliff:g id="TIME">^1</xliff:g> працы з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Усяго <xliff:g id="TIME">^1</xliff:g> працы за апошнія 24 гадз"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Усяго <xliff:g id="TIME_0">^1</xliff:g> за перыяд <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> працы ў фонавым рэжыме з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> працы ў фонавым рэжыме з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> працы ў фонавым рэжыме за апошнія 24 гадз"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> працы ў фонавым рэжыме за перыяд <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Усяго <xliff:g id="TIME">^1</xliff:g> • Менш чым хвіліна працы ў фонавым рэжыме\nз моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Усяго <xliff:g id="TIME">^1</xliff:g> • менш за хвіліну працы ў фонавым рэжыме\nз моманту апошняй поўнай зарадкі"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Усяго <xliff:g id="TIME">^1</xliff:g> • Менш чым хвіліна працы ў фонавым рэжыме\nза апошнія 24 гадз"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Усяго <xliff:g id="TIME_0">^1</xliff:g> • Менш чым хвіліна працы ў фонавым рэжыме\nза перыяд <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Не выкарыстоўваўся з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Не выкарыстоўвалася з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Не выкарыстоўваўся ў апошнія 24 гадз"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Іншыя карыстальнікі"</string>
@@ -3579,7 +3576,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Выдаліць <xliff:g id="USER_NAME">%1$s</xliff:g> з гэтай прылады"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Налады экрана блакіроўкі"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Дадаваць карыстальнікаў з экрана блакіроўкі"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"На док-станцыі пераключацца на адміністратара"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Выдаляеце сябе?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Выдаліць карыстальніка?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Выдаліць гэты профіль?"</string>
@@ -4304,8 +4302,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Па вашым запыце Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Па вашым запыце Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Па вашым запыце Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Гэта праграма не адпраўляе апавяшчэнні"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Катэгорыі"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Іншае"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 6e018b1..76a7c9b 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Никога"</item>
-    <item msgid="5065465585332446709">"След 1 минута"</item>
-    <item msgid="622807566366131941">"След 5 минути"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d3e77d5..fcfdf47 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Моделът на лицето ви ще бъде изтрит надеждно и за постоянно.\n\nСлед това ще имате нужда от ПИН кода, фигурата или паролата си, за да отключвате телефона си."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Използвайте функцията „Отключване с лице“, за да отключвате телефона си"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Отпечатък"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"При използване на „Отключване с отпечатък“"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Отпечатък за служ. цели"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Отпечатъци: Управл."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Oтпечатък: Ползване за"</string>
@@ -595,16 +594,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечатъкът е добавен"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Вече можете да използвате отпечатъка си, за да отключвате таблета или да потвърждавате самоличността си, например при влизане в приложения или одобряване на покупки"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Вече можете да използвате отпечатъка си, за да отключвате таблета или да потвърждавате самоличността си, например при влизане в приложения"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Вече можете да използвате отпечатъка си, за да отключвате устройството или да потвърждавате самоличността си, например при влизане в приложения"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Вече можете да използвате отпечатъка си, за да отключвате телефона или да потвърждавате самоличността си, например при влизане в приложения"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Отключване само когато екранът е включен"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Екранът трябва да е включен, преди да можете да отключвате с отпечатъка си. По този начин случайното отключване е по-малко вероятно."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Екран, отключване"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"По-късно"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Вдигнете пръст и докоснете отново"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Поставете едната страна на пръста си върху сензора и задръжте, след това поставете другата"</string>
@@ -1529,8 +1527,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Не е налице, защото режимът „Време за сън“ е вкл."</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Използване на скрийнсейвър"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"При зареждане или връзка с докинг станция"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"При свързв. с докинг станция и зарежд."</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"При зареждане"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"При свързване с докинг станция"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Никога"</string>
@@ -2820,7 +2817,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"История"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Използване на батерията"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Преглед на употребата за последните 24 ч"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Употреба от последното пълно зареждане"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Употреба след последното пълно зареждане"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Използване на батерията от приложението"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Подробности"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Настройване на захранването"</string>
@@ -3001,25 +2998,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Използване на батерията"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"След пълно зареждане"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Управление на използването на батерията"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Общо <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> на заден план\nслед последното пълно зареждане"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Общо <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> на заден план\nслед последното пълно зареждане"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Общо <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> на заден план\nза последните 24 ч"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Общо <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> на заден план\nза периода <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Общо по-малко от минута след последното пълно зареждане"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Общо по-малко от минута след последното пълно зареждане"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Общо по-малко от минута за последните 24 ч"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Общо по-малко от минута за периода <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"По-малко от минута на заден план след последното пълно зареждане"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"По-малко от минута на заден план след последното пълно зареждане"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"По-малко от минута на заден план за последните 24 ч"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"По-малко от минута на заден план за периода <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Общо <xliff:g id="TIME">^1</xliff:g> след последното пълно зареждане"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Общо <xliff:g id="TIME">^1</xliff:g> след последното пълно зареждане"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Общо <xliff:g id="TIME">^1</xliff:g> за последните 24 ч"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Общо <xliff:g id="TIME_0">^1</xliff:g> за периода <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> на заден план след последното пълно зареждане"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> на заден план след последното пълно зареждане"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> на заден план за последните 24 ч"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> на заден план за периода <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Общо <xliff:g id="TIME">^1</xliff:g> • По-малко от минута на заден план\nслед последното пълно зареждане"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Общо <xliff:g id="TIME">^1</xliff:g> • по-малко от минута на заден план\nслед последното пълно зареждане"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Общо <xliff:g id="TIME">^1</xliff:g> • По-малко от минута на заден план\nза последните 24 ч"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Общо <xliff:g id="TIME_0">^1</xliff:g> • По-малко от минута на заден план\nза периода <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Батерията не е използвана след последното пълно зареждане"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Батерията не е използвана след последното пълно зареждане"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Батерията не е използвана през последните 24 ч"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Други потребители"</string>
@@ -3499,7 +3496,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Изтриване на <xliff:g id="USER_NAME">%1$s</xliff:g> от у-вото"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Настройки на заключения екран"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Добавяне на потребители от заключения екран"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Превкл. към потребител с админ. достъп при свързване с докинг станция"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Искате ли да се изтриете?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Изтриване на потребителя?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Ще прем. ли потр. профил?"</string>
@@ -4212,8 +4210,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"По ваша заявка Android блокира показването на известията от това приложение на устройството"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"По ваша заявка Android блокира показването на тази категория известия на устройството"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"По ваша заявка Android блокира показването на тази група известия на устройството"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Това приложение не изпраща известия"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Категории"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Други"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 0a29001..10ce151 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"কখনওই নয়"</item>
-    <item msgid="5065465585332446709">"১ মিনিট পর"</item>
-    <item msgid="622807566366131941">"৫ মিনিট পর"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c47b98f..24bc6aa 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"আপনার ফেস মডেল স্থায়ীভাবে এবং নিরাপদে মুছে ফেলা হবে।\n\nমুছে ফেলার পরে, আপনার ফোন আনলক করতে পিন, প্যাটার্ন বা পাসওয়ার্ড প্রয়োজন হবে।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"আপনার ফোন আনলক করার জন্য \'ফেস আনলক\' ব্যবহার করুন"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"আঙ্গুলের ছাপ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ফিঙ্গারপ্রিন্ট আনলক ব্যবহার করার সময়"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"কাজের জন্য ফিঙ্গারপ্রিন্ট"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"আঙ্গুলের ছাপগুলি পরিচালনা করুন"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"এর জন্য আঙ্গুলের ছাপ ব্যবহার করুন"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ এনরোল করা হয়েছে"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"আঙ্গুলের ছাপ নথিভুক্ত করার কাজটি <xliff:g id="PERCENTAGE">%d</xliff:g> শতাংশ সম্পূর্ণ হয়েছে"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ফিঙ্গারপ্রিন্ট যোগ করা হয়েছে"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"অ্যাপে সাইন-ইন বা কেনাকাটায় অনুমতি দেওয়ার সময় যেমন করেন, ঠিক তেমনভাবেই ট্যাবলেট আনলক বা নিজের পরিচয় যাচাই করতে এখন আপনার ফিঙ্গারপ্রিন্ট ব্যবহার করতে পারবেন"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"অ্যাপে সাইন-ইন করার মতোই এখন ফিঙ্গারপ্রিন্ট ব্যবহার করে আপনি ট্যাবলেট আনলক বা নিজের পরিচয় যাচাই করতে পারবেন"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"অ্যাপে সাইন-ইন করার মতোই এখন ফিঙ্গারপ্রিন্ট ব্যবহার করে আপনি ডিভাইস আনলক বা নিজের পরিচয় যাচাই করতে পারবেন"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"অ্যাপে সাইন-ইন করার মতোই এখন ফিঙ্গারপ্রিন্ট ব্যবহার করে আপনি ফোন আনলক বা নিজের পরিচয় যাচাই করতে পারবেন"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"শুধুমাত্র স্ক্রিন চালু থাকা অবস্থাতে আনলক করা"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"আপনি নিজের ফিঙ্গারপ্রিন্টের মাধ্যমে আনলক করতে পারার আগে স্ক্রিন অবশ্যই চালু থাকতে হবে। এর ফলে ভুলবশত আনলক হওয়ার ঘটনা কম ঘটে।"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"স্ক্রিন, আনলক করুন"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"এটি পরে করুন"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"আঙ্গুল তুলুন, তারপর আবার স্পর্শ করুন"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"প্রথমে আপনার আঙুলের একটি কোণা সেন্সরে কিছুটা সময়ের জন্য রেখে ধরে থাকুন এবং তারপর অন্য দিক থেকে আবার একই জিনিস করুন"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"বেডটাইম মোড চালু থাকায় এই সুবিধা উপলভ্য নয়"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"স্ক্রিন সেভার ব্যবহার করা"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"চার্জ অথবা ডক করার সময়"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ডক করা অবস্থায় বা চার্জ হতে থাকলে"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"চার্জ করার সময়"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ডক করে রাখার সময়"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"কখনই নয়"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ইতিহাস বিবরণ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ব্যাটারির ব্যবহার"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"গত ২৪ ঘণ্টার ব্যবহারের তথ্য দেখুন"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"শেষ সম্পূর্ণ চার্জ হওয়ার সময় থেকে ব্যাটারি ব্যবহার দেখুন"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"শেষবার ফুল চার্জ হওয়া থেকে ব্যাটারির ব্যবহার দেখুন"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"অ্যাপের জন্য ব্যাটারির ব্যবহার"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"বিবরণ ব্যবহার করুন"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"বিদ্যুতের ব্যবহার সামঞ্জস্য করুন"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ব্যাটারির ব্যবহার"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"সম্পূর্ণ চার্জ হওয়ার সময় থেকে"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ব্যাটারির ব্যবহার পরিচালনা করুন"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"শেষ বার সম্পূর্ণ চার্জ করার পরে ব্যাটারির\nমোট ব্যবহার <xliff:g id="TIME_0">^1</xliff:g> ধরে করা হয়েছে • ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার <xliff:g id="TIME_1">^2</xliff:g> ধরে করা হয়েছে"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"শেষবার ফুল চার্জ হওয়ার পরে ব্যাটারি\nমোট <xliff:g id="TIME_0">^1</xliff:g> • ব্যাকগ্রাউন্ডে <xliff:g id="TIME_1">^2</xliff:g> ব্যবহার করা হয়েছে"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"গত ২৪ ঘন্টায় ব্যাটারির\nমোট ব্যবহার <xliff:g id="TIME_0">^1</xliff:g> ধরে করা হয়েছে • ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার <xliff:g id="TIME_1">^2</xliff:g> ধরে করা হয়েছে"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"মোট <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> এ<xliff:g id="TIME_1">^2</xliff:g> ব্যাকগ্রাউন্ডে\n ব্যবহার"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"শেষ বার সম্পূর্ণ চার্জ করার পরে ব্যাকগ্রাউন্ডে ব্যাটারির মোট ব্যবহার এক মিনিটেরও কম সময়ের জন্য করা হয়েছে"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"শেষবার ফুল চার্জ হওয়ার পরে ব্যাটারি মোট এক মিনিটেরও কম সময়ের জন্য ব্যবহার করা হয়েছে"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"গত ২৪ ঘন্টায় ব্যাকগ্রাউন্ডে ব্যাটারির মোট ব্যবহার এক মিনিটেরও কম সময়ের জন্য করা হয়েছে"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g>-এর মধ্যে ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার মোট এক মিনিটের চেয়েও কম সময় হয়েছে"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"শেষ বার সম্পূর্ণ চার্জ করার পরে ব্যাকগ্রাউন্ডে ব্যাটারি এক মিনিটেরও কম সময়ের জন্য ব্যবহার করা হয়েছে"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"শেষবার ফুল চার্জ হওয়ার পরে ব্যাকগ্রাউন্ডে ব্যাটারি এক মিনিটেরও কম সময় ব্যবহার করা হয়েছে"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"গত ২৪ ঘন্টায় ব্যাকগ্রাউন্ডে ব্যাটারি এক মিনিটেরও কম সময়ের জন্য ব্যবহার করা হয়েছে"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"গত <xliff:g id="TIME_PERIOD">^1</xliff:g>-এর মধ্যে ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার এক মিনিটেরও কম"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"শেষ বার সম্পূর্ণ চার্জ করার পরে ব্যাটারি <xliff:g id="TIME">^1</xliff:g> ধরে ব্যবহার করা হয়েছে"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"শেষবার ফুল চার্জ হওয়ার পরে ব্যাটারি মোট <xliff:g id="TIME">^1</xliff:g> ব্যবহার করা হয়েছে"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"গত ২৪ ঘন্টায় ব্যাটারির মোট ব্যবহার <xliff:g id="TIME">^1</xliff:g> ধরে করা হয়েছে"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>-এর মধ্যে ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার মোট <xliff:g id="TIME_0">^1</xliff:g> করা হয়েছে"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"শেষ বার সম্পূর্ণ চার্জ করার পরে ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার <xliff:g id="TIME">^1</xliff:g> ধরে করা হয়েছে"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"শেষবার ফুল চার্জ হওয়ার পর থেকে ব্যাকগ্রাউন্ডে <xliff:g id="TIME">^1</xliff:g> ব্যাটারি ব্যবহার করা হয়েছে"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"গত ২৪ ঘন্টায় ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার <xliff:g id="TIME">^1</xliff:g> ধরে করা হয়েছে"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g>-এর মধ্যে ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"শেষ বার সম্পূর্ণ চার্জ করার পরে ব্যাটারির\nমোট ব্যবহার <xliff:g id="TIME">^1</xliff:g> ধরে করা হয়েছে • ব্যাকগ্রাউন্ডে এক মিনিটেরও কম সময়ের জন্য করা হয়েছে"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"শেষবার ফুল চার্জ হওয়ার পরে ব্যাটারি\nমোট <xliff:g id="TIME">^1</xliff:g> • ব্যাকগ্রাউন্ডে ব্যাটারি এক মিনিটেরও কম সময় ব্যবহার করা হয়েছে"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"গত ২৪ ঘন্টায় ব্যাটারির\nমোট ব্যবহার <xliff:g id="TIME">^1</xliff:g> ধরে করা হয়েছে • ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার এক মিনিটেরও কম সময়ের জন্য করা হয়েছে"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"মোট <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> এ\n ব্যাকগ্রাউন্ডে ব্যাটারির ব্যবহার এক মিনিটেরও কম"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"শেষ বার সম্পূর্ণ চার্জ করার পরে আর ব্যাটারি ব্যবহার করা হয়নি"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"শেষবার ফুল চার্জ হওয়ার পরে ব্যাটারি ব্যবহার করা হয়নি"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"গত ২৪ ঘন্টায় ব্যাটারি আর ব্যবহার করা হয়নি"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"অন্যান্য ব্যবহারকারী"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"এই ডিভাইস থেকে <xliff:g id="USER_NAME">%1$s</xliff:g> মুছে ফেলুন"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"লক স্ক্রিন সেটিংস"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"লক স্ক্রিন থেকে ব্যবহারকারীদের যোগ করুন"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ডক করা হলে অ্যাডমিন ব্যবহারকারীতে পাল্টান"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"নিজেকে মুছবেন?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"অ্যাকাউন্ট মুছতে চান?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"এই প্রোফাইলটি সরাবেন?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপনার অনুরোধ অনুযায়ী Android এই অ্যাপের বিজ্ঞপ্তি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপনার অনুরোধ অনুযায়ী Android এই বিভাগের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"আপনার অনুরোধ অনুযায়ী Android এই ধরনের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"এই অ্যাপ কোনও বিজ্ঞপ্তি পাঠায় না"</string>
     <string name="notification_channels" msgid="1502969522886493799">"বিভাগগুলি"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"অন্যান্য"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 3e1f8f3..2d510ad 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nikada"</item>
-    <item msgid="5065465585332446709">"Nakon 1 min"</item>
-    <item msgid="622807566366131941">"Nakon 5 min"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 47403c2..0db3a94 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -456,7 +456,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Model lica će se trajno i sigurno izbrisati.\n\nNakon brisanja će vam trebati PIN, uzorak ili lozinka radi otključavanja telefona."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Otključajte telefon pomoću otključavanja licem"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Otisak prsta"</string>
-    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Kad se koristi otključavanje otiskom prsta"</string>
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Kada koristite otključavanje otiskom prsta"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Otisak prsta za posao"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Upravljanje otiscima prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Koristi otisak prsta za"</string>
@@ -592,13 +592,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Prijavljeno je <xliff:g id="PERCENTAGE">%d</xliff:g> posto"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Prijava otiska prsta: <xliff:g id="PERCENTAGE">%d</xliff:g> posto"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Dodan je otisak prsta"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Sada možete koristiti otisak prsta da otključate tablet ili potvrdite identitet, naprimjer prilikom prijavljivanja u aplikacije ili odobravanja kupovine"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Sada možete koristiti otisak prsta da otključate tablet ili potvrdite identitet, naprimjer kada se prijavljujete u aplikacije"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Sada možete koristiti otisak prsta da otključate uređaj ili potvrdite identitet, naprimjer kada se prijavljujete u aplikacije"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Sada možete koristiti otisak prsta da otključate telefon ili potvrdite identitet, naprimjer kada se prijavljujete u aplikacije"</string>
-    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Otključavanje samo kad je zaslon uključen"</string>
-    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Zaslon mora biti uključen da biste ga mogli otključati otiskom prsta. Time se smanjuje mogućnost slučajnog otključavanja."</string>
-    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Zaslon, otključati"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Otključavanje samo kad je ekran uključen"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ekran mora biti uključen da možete otključati otiskom prsta. To čini slučajno otključavanje manje vjerovatnim."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekran, otključavanje"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Uradit ću to kasnije"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Podignite i ponovo dodirnite"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Stranu prsta postavite na senzor i zadržite, a zatim ga prebacite na drugu stranu"</string>
@@ -1539,7 +1541,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Nedostupno jer je uključen način rada za spavanje"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Koristi čuvara ekrana"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Tokom punjenja ili kada je na priključnoj stanici"</string>
-    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Na priklj. stanici tijekom punjenja"</string>
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Dok je uređaj priključen i puni se"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Tokom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Kada je na priključnoj stanici"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nikada"</string>
@@ -2840,7 +2842,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalji historije"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Potrošnja baterije"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Prikaz potrošnje u posljednja 24 sata"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Korištenje od zadnjeg potpunog punjenja"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Prikaz potrošnje od poslj. pot. punjenja"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Potrošnja baterije za aplikaciju"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalji o upotrebi"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Podesite potrošnju energije"</string>
@@ -3028,25 +3030,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Potrošnja baterije"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od potpune napunjenosti"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Upravljajte potrošnjom baterije"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Ukupno: <xliff:g id="TIME_0">^1</xliff:g> • vrijeme u pozadini\nod posljednje potpune napunjenosti: <xliff:g id="TIME_1">^2</xliff:g>"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> ukupno • <xliff:g id="TIME_1">^2</xliff:g> pozadinske potrošnje\nod posljednjeg potpunog punjenja"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Ukupno: <xliff:g id="TIME_0">^1</xliff:g> • vrijeme u pozadini\nza posljednja 24 h: <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Ukupno: <xliff:g id="TIME_0">^1</xliff:g> • vrijeme u pozadini\nza period <xliff:g id="TIME_PERIOD">^3</xliff:g>: <xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Ukupno vrijeme je kraće od minute od posljednje potpune napunjenosti"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Ukupno vrijeme je kraće od minute od posljednje potpune napunjenosti"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Ukupno vrijeme je kraće od minute za posljednja 24 h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Ukupno vrijeme je kraće od minute za period <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Vrijeme u pozadini je kraće od minute od posljednje potpune napunjenosti"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Vrijeme u pozadini je kraće od minute od posljednje potpune napunjenosti"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Vrijeme u pozadini je kraće od minute za posljednja 24 h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Vrijeme u pozadini je kraće od minute za period <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Ukupno od posljednje potpune napunjenosti: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> ukupno od posljednjeg potpunog punjenja"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Ukupno za posljednja 24 h: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> za period <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Vrijeme u pozadini od posljednje potpune napunjenosti: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> pozadinske potrošnje od posljednjeg potpunog punjenja"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Vrijeme u pozadini za posljednja 24 h: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> u pozadini za period <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Ukupno: <xliff:g id="TIME">^1</xliff:g> • vrijeme u pozadini je kraće od minute\nod posljednje potpune napunjenosti"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> ukupno • pozadinska potrošnja kraća od minutu\nod posljednjeg potpunog punjenja"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Ukupno: <xliff:g id="TIME">^1</xliff:g> • vrijeme u pozadini je kraće od minute\nza posljednja 24 h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Ukupno: <xliff:g id="TIME_0">^1</xliff:g> • vrijeme u pozadini je kraće od minute\nza period <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nema korištenja od posljednje potpune napunjenosti"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nema potrošnje od posljednjeg potpunog punjenja"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nema korištenja za posljednja 24 h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Drugi korisnici"</string>
@@ -3530,7 +3532,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Izbrišite <xliff:g id="USER_NAME">%1$s</xliff:g> sa uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Postavke zaključavanja ekrana"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Dodavanje korisnika sa zaključanog ekrana"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Prebacite se na admin. kada je uređaj priključen"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Želite li izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Izbrisati ovog korisnika?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Ukloniti ovaj profil?"</string>
@@ -4249,7 +4252,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vaš zahtjev, Android blokira pojavljivanje obavještenja iz ove aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vaš zahtjev, Android blokira pojavljivanje ove kategorije obavještenja na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vaš zahtjev, Android blokira pojavljivanje ove grupe obavještenja na ovom uređaju"</string>
-    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Ova aplikacija ne šalje obavijesti"</string>
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Ova aplikacija ne šalje obavještenja"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorije"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Ostalo"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -5206,7 +5209,7 @@
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"Sinhronizacija je uključena za stavke: <xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"Sinhronizacija je uključena za sve stavke"</string>
     <string name="account_sync_summary_all_off" msgid="6378301874540507884">"Sinhronizacija je isključena za sve stavke"</string>
-    <string name="enterprise_privacy_settings" msgid="786350385374794180">"Podaci o upravljanom uređaju"</string>
+    <string name="enterprise_privacy_settings" msgid="786350385374794180">"Podaci o uređaju kojim se upravlja"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"Promjene i postavke kojima upravlja vaša organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"Promjene i postavke kojima upravlja organizacija <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="enterprise_privacy_header" msgid="4626225398848641603">"Za davanje pristupa vašim radnim podacima, vaša organizacija može na vašem uređaju promijeniti postavke i instalirati softver.\n\nZa više informacija, obratite se administratoru vaše organizacije."</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 0f94336..6c81342 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Mai"</item>
-    <item msgid="5065465585332446709">"Després d\'1 minut"</item>
-    <item msgid="622807566366131941">"Després de 5 minuts"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b61e069..e55e24e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Se suprimirà el teu model facial de manera permanent i segura.\n\nDesprés de suprimir-lo, necessitaràs un PIN, un patró o una contrasenya per desbloquejar el teu telèfon."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Utilitza Desbloqueig facial per desbloquejar el telèfon"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Empremta digital"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"En utilitzar Desbloqueig amb empremta digital"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Empremta de la feina"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Gest. empremtes digit."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Empremta digital per"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"S\'ha inscrit un <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registre de l\'empremta digital <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"S\'ha afegit l\'empremta digital"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Ara pots utilitzar l\'empremta digital per desbloquejar la tauleta o verificar que ets tu, com ara quan inicies la sessió en aplicacions o aproves una compra"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Ara pots utilitzar l\'empremta digital per desbloquejar la tauleta o verificar que ets tu, com ara quan inicies la sessió en aplicacions"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Ara pots utilitzar l\'empremta digital per desbloquejar el dispositiu o verificar la teva identitat, com ara quan inicies la sessió en aplicacions"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Ara pots utilitzar l\'empremta digital per desbloquejar el telèfon o verificar la teva identitat, com ara quan inicies la sessió en aplicacions"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloqueja només quan la pantalla estigui activada"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"La pantalla ha d\'estar activada abans de poder desbloquejar el dispositiu amb la teva empremta digital. Així és menys probable que hi hagi desbloquejos accidentals."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Pantalla, desbloqueig"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Fes-ho més tard"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Aixeca el dit i toca de nou"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Col·loca un costat del dit al sensor i espera; a continuació, canvia a l\'altre costat"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalls de l\'historial"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Ús de la bateria"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Consulta l\'ús de les 24 darreres hores"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Mostra ús des de darrera càrrega completa"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Veure ús des de l\'última càrrega completa"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Ús de la bateria de l\'aplicació"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalls d\'ús"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Redueix el consum de la bateria"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Ús de la bateria"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Des de la càrrega completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gestiona l\'ús de la bateria"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segon pla\ndes de la darrera càrrega completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segon pla\ndes de la darrera càrrega completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segon pla\ndurant les 24 darreres hores"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segon pla\nentre <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Menys d\'1 minut en total des de la darrera càrrega completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Menys d\'1 minut en total des de la darrera càrrega completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Menys d\'1 minut en total durant les 24 darreres hores"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Menys d\'1 minut en total entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menys d\'1 minut en segon pla des de la darrera càrrega completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menys d\'un minut en segon pla des de la darrera càrrega completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menys d\'1 minut en segon pla durant les 24 darreres hores"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menys d\'1 minut en segon pla entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> en total des de la darrera càrrega completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> en total des de la darrera càrrega completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> en total durant les 24 darreres hores"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> en total entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> en segon pla des de la darrera càrrega completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> en segon pla des de la darrera càrrega completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> en segon pla durant les 24 darreres hores"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> en segon pla entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> en total • Menys d\'1 minut en segon pla\ndes de la darrera càrrega completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> en total • menys d\'un minut en segon pla\ndes de la darrera càrrega completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> en total • Menys d\'1 minut en segon pla\ndurant les 24 darreres hores"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> en total • Menys d\'1 minut en segon pla\nentre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Sense ús des de la darrera càrrega completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Sense ús des de la darrera càrrega completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Sense ús durant les 24 darreres hores"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Altres usuaris"</string>
@@ -3466,8 +3464,8 @@
       <item quantity="other">Confia en els certificats o suprimeix-los</item>
       <item quantity="one">Confia en el certificat o suprimeix-lo</item>
     </plurals>
-    <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} ha instal·lat una autoritat de certificació al teu dispositiu, que pot permetre-li supervisar l\'activitat a la xarxa del dispositiu, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb el teu administrador.}other{{orgName} ha instal·lat unes autoritats de certificació al teu dispositiu, que pot permetre-li supervisar l\'activitat a la xarxa del dispositiu, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquests certificats, contacta amb el teu administrador.}}"</string>
-    <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} ha instal·lat una autoritat de certificació per al teu perfil de treball, que pot permetre-li supervisar l\'activitat a la xarxa del perfil de treball, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb el teu administrador.}other{{orgName} ha instal·lat unes autoritats de certificació per al teu perfil de treball, que pot permetre-li supervisar l\'activitat a la xarxa del perfil de treball, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquests certificats, contacta amb el teu administrador.}}"</string>
+    <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} ha instal·lat una autoritat de certificació al teu dispositiu, que pot permetre-li supervisar l\'activitat de xarxa del dispositiu, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb el teu administrador.}other{{orgName} ha instal·lat unes autoritats de certificació al teu dispositiu, que pot permetre-li supervisar l\'activitat de xarxa del dispositiu, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquests certificats, contacta amb el teu administrador.}}"</string>
+    <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} ha instal·lat una autoritat de certificació per al teu perfil de treball, que pot permetre-li supervisar l\'activitat de xarxa del perfil de treball, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb el teu administrador.}other{{orgName} ha instal·lat unes autoritats de certificació per al teu perfil de treball, que pot permetre-li supervisar l\'activitat de xarxa del perfil de treball, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquests certificats, contacta amb el teu administrador.}}"</string>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Un tercer pot supervisar la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nHi ha una credencial de confiança instal·lada al teu dispositiu que ho fa possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="other">Comprova els certificats</item>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Suprimeix <xliff:g id="USER_NAME">%1$s</xliff:g> del dispositiu"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Configuració de la pantalla de bloqueig"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Afegeix usuaris des de la pantalla de bloqueig"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Canvia a l\'usuari administrador quan estigui acoblat"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Et vols suprimir a tu mateix?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Vols suprimir l\'usuari?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Vols suprimir el perfil?"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 483ef13..148be92 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nikdy"</item>
-    <item msgid="5065465585332446709">"Po 1 minutě"</item>
-    <item msgid="622807566366131941">"Po 5 minutách"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 58c9bfb..db5cc3b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Model obličeje bude trvale a bezpečně smazán.\n\nPo smazání budete k odemknutí telefonu potřebovat PIN, gesto nebo heslo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Odemykejte telefon pomocí obličeje"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Otisk prstu"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Při použití odemknutí otiskem prstu"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Otisk prstu pro práci"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Správa otisků prstů"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"K čemu otisk používat"</string>
@@ -597,16 +596,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Zaregistrováno <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrace otisku prstu: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisk byl přidán"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Odteď můžete otiskem prstu odemykat tablet nebo ověřovat svoji identitu, například při přihlašování do aplikací nebo schvalování nákupů"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Odteď můžete pomocí otisku prstu odemykat tablet nebo ověřovat svoji identitu, například při přihlašování do aplikací"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Odteď můžete pomocí otisku prstu odemykat zařízení nebo ověřovat svoji identitu, například při přihlašování do aplikací"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Odteď můžete pomocí otisku prstu odemykat telefon nebo ověřovat svoji identitu, například při přihlašování do aplikací"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Odemknou jen při zapnuté obrazovce"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Před odemknutím pomocí otisku prstu musí být obrazovka zapnutá. Nezamýšlené odemknutí je tak méně pravděpodobné."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Obrazovka, odemknutí"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Později"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Zvedněte prst a dotkněte se znovu"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Umístěte boční stranu prstu na snímač a podržte ho, poté ho „překulte“ na druhou stranu"</string>
@@ -2875,7 +2873,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Podrobnosti historie"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Využití baterie"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Využití za posledních 24 hodin"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Využití od posledního plného nabití"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Zobrazit využití od posledního úplného nabití"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Využití baterie aplikací"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Podrobnosti využívání"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Upravit spotřebu energie"</string>
@@ -3070,25 +3068,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Využití baterie"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od úplného nabití"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Správa využití baterie"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Celkem <xliff:g id="TIME_0">^1</xliff:g> • Od posledního nabití\npoužíváno na pozadí <xliff:g id="TIME_1">^2</xliff:g>"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Celkem <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> na pozadí\nod posledního úplného nabití"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Celkem <xliff:g id="TIME_0">^1</xliff:g> • Za uplynulých 24 hodin\npoužíváno na pozadí <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Celkem <xliff:g id="TIME_0">^1</xliff:g> • V období <xliff:g id="TIME_PERIOD">^3</xliff:g>\npoužíváno na pozadí <xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Od posledního nabití celkem méně než minutu"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Od posledního úplného nabití celkem méně než minutu"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Za posledních 24 hodin používáno celkem méně než minutu"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"V období <xliff:g id="TIME_PERIOD">^1</xliff:g> používáno celkem méně než minutu"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Od posledního nabití používáno na pozadí méně než minutu"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Od posledního úplného nabití používáno na pozadí méně než minutu"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Za posledních 24 hodin používáno na pozadí méně než minutu"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"V období <xliff:g id="TIME_PERIOD">^1</xliff:g> používáno na pozadí méně než minutu"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Celkem <xliff:g id="TIME">^1</xliff:g> od posledního nabití"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Celkem <xliff:g id="TIME">^1</xliff:g> od posledního úplného nabití"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Za posledních 24 hodin používáno celkem <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Za období <xliff:g id="TIME_PERIOD">^2</xliff:g> používáno celkem <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Od posledního nabití používáno na pozadí <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Od posledního úplného nabití používáno <xliff:g id="TIME">^1</xliff:g> na pozadí"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Za posledních 24 hodin používáno na pozadí <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"V období <xliff:g id="TIME_PERIOD">^2</xliff:g> používáno na pozadí <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Celkem <xliff:g id="TIME">^1</xliff:g> • Od posledního nabití\npoužíváno na pozadí méně než minutu"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Celkem <xliff:g id="TIME">^1</xliff:g> • na pozadí méně než minutu\nod posledního úplného nabití"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Celkem <xliff:g id="TIME">^1</xliff:g> • Za posledních 24 hodin\npoužíváno na pozadí méně než minutu"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Celkem <xliff:g id="TIME_0">^1</xliff:g> • V období <xliff:g id="TIME_PERIOD">^2</xliff:g> používáno na pozadí\nméně než minutu"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Od posledního nabití žádné využití"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Žádné využití od posledního úplného nabití"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Za posledních 24 hodin žádné využití"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Další uživatelé"</string>
@@ -3576,7 +3574,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Smazat <xliff:g id="USER_NAME">%1$s</xliff:g> ze zařízení"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Nastavení obrazovky uzamčení"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Přidávat uživatele z obrazovky uzamčení"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"V doku přepnout na administrativního uživatele"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Chcete se smazat?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Smazat tohoto uživatele?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Odstranit tento profil?"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 86a63a5..0fc8c8f 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Aldrig"</item>
-    <item msgid="5065465585332446709">"Efter 1 minut"</item>
-    <item msgid="622807566366131941">"Efter 5 minutter"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e31201b..4ced82e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Din ansigtsmodel slettes permanent og på sikker vis.\n\nNår den er slettet, skal du bruge dit fingeraftryk, din pinkode, dit mønster eller din adgangskode til at låse din telefon op."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Brug ansigtslås til at låse din telefon op"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingeraftryk"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Når du bruger oplåsning med fingeraftryk"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingeraftryk til arbejde"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Adm. fingeraftryk"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Brug fingeraftryk til"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> procent konfigureret"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Scanning af fingeraftryk: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeraftryk tilføjet"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Nu kan du bruge dit fingeraftryk til at låse din tablet op eller verificere din identitet, f.eks. når du logger ind i apps eller godkender et køb"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Nu kan du bruge dit fingeraftryk til at låse din tablet op eller verificere din identitet, f.eks. når du logger ind i apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Nu kan du bruge dit fingeraftryk til at låse din enhed op eller verificere din identitet, f.eks. når du logger ind i apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Nu kan du bruge dit fingeraftryk til at låse din telefon op eller bekræfte din identitet, f.eks. når du logger ind i apps"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Lås kun op, når skærmen er tændt"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Skærmen skal være tændt, før du kan låse op med dit fingeraftryk. Det gør det sværere at komme til at låse op ved et uheld."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skærm, oplåsning"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gør det senere"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Løft, og tryk igen"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Placer siden af din finger på sensoren, og hold den nede. Skift derefter til den anden side."</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Ikke tilgængelig, da sengetidstilstand er aktiv"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Brug pauseskærm"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Under opladning, eller når enheden er sluttet til en dockingstation"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Når den oplader i dockingstationen"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Under opladning"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Når enheden er tilsluttet en dockingstation"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Aldrig"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detaljeret historik"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batteriforbrug"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Se forbrug for de seneste 24 timer"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Se forbrug siden seneste fulde opladning"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Se forbrug siden sidste fulde opladning"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Appens batteriforbrug"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Brugsdetaljer"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Juster strømforbrug"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Batteriforbrug"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Siden fuld opladning"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Administrer batteriforbrug"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> i alt • Brugt i baggrunden i <xliff:g id="TIME_1">^2</xliff:g>\nsiden sidste fulde opladning"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> i alt • Brugt <xliff:g id="TIME_1">^2</xliff:g> i baggrunden\nsiden sidste fulde opladning"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> i alt • Brugt i baggrunden i <xliff:g id="TIME_1">^2</xliff:g>\ni løbet af de seneste 24 timer"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> i alt • Brugt i baggrunden i <xliff:g id="TIME_1">^2</xliff:g>\ni tidsrummet <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Brugt i mindre end ét minut siden sidste fulde opladning"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Brugt i mindre end ét minut siden sidste fulde opladning"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Brugt i mindre end ét minut i alt i løbet af de seneste 24 timer"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Brugt i mindre end ét minut i alt i tidsrummet <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Brugt i baggrunden i mindre end ét minut siden sidste fulde opladning"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Brugt i baggrunden i mindre end ét minut siden sidste fulde opladning"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Brugt i baggrunden i mindre end ét minut i løbet af de seneste 24 timer"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Brugt i baggrunden i mindre end ét minut i tidsrummet <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> i alt siden sidste fulde opladning"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> i alt siden sidste fulde opladning"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> i alt i løbet af de seneste 24 timer"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Brugt <xliff:g id="TIME_0">^1</xliff:g> i alt i tidsrummet <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Brugt i baggrunden i <xliff:g id="TIME">^1</xliff:g> siden sidste fulde opladning"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Brugt <xliff:g id="TIME">^1</xliff:g> i baggrunden siden sidste fulde opladning"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Brugt i baggrunden i <xliff:g id="TIME">^1</xliff:g> i løbet af de seneste 24 timer"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"Brugt i baggrunden i <xliff:g id="TIME_0">^1</xliff:g> i tidsrummet <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> i alt • Brugt i baggrunden i mindre end ét minut\nsiden sidste fulde opladning"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> i alt • Brugt i baggrunden i mindre end ét minut\nsiden sidste fulde opladning"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> i alt • Brugt i baggrunden i mindre end ét minut\ni løbet af de seneste 24 timer"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> i alt • Brugt i baggrunden i mindre end ét minut\ni tidsrummet <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Ikke brugt i baggrunden siden sidste fulde opladning"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Intet forbrug siden sidste fulde opladning"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Ikke brugt i løbet af de seneste 24 timer"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Andre brugere"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Slet <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enhed"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lås skærmindstillinger"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Tilføj brugere fra låseskærm"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Skift til administrator, når sat i dockingstation"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Vil du slette dig selv?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Vil du slette brugeren?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Vil du fjerne profilen?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android blokerer på din anmodning notifikationer for denne app, så de ikke vises på enheden"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android blokerer på din anmodning notifikationer i denne kategori, så de ikke vises på enheden"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android blokerer på din anmodning notifikationer i denne gruppe, så de ikke vises på enheden"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Denne app sender ikke notifikationer"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorier"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Andre"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 69ae7bc..c52de95 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nie"</item>
-    <item msgid="5065465585332446709">"Nach 1 Minute"</item>
-    <item msgid="622807566366131941">"Nach 5 Minuten"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1277093..be0c69c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Dein Gesichtsmodell wird dauerhaft und sicher gelöscht.\n\nNach dem Löschen benötigst du deine PIN, dein Muster oder dein Passwort, um dein Smartphone zu entsperren."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Verwende die Entsperrung per Gesichtserkennung, um dein Smartphone zu entsperren"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingerabdruck"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Wenn die Entsperrung per Fingerabdruck genutzt wird"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingerabdruck-Einstellungen für die Arbeit"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Fingerabdrücke verwalten"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Abdruck nutzen für"</string>
@@ -595,16 +594,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerabdruck hinzugefügt"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Tablet zu entsperren oder deine Identität zu bestätigen, z. B. um dich in Apps anzumelden oder Käufe zu autorisieren"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Tablet zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Gerät zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Du kannst jetzt deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder dich in Apps zu authentifizieren, beispielsweise um dich anzumelden."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Nur entsperren, wenn das Display aktiviert ist"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Das Display muss aktiviert sein, bevor du es mit deinem Fingerabdruck entsperren kannst. Versehentliches Entsperren wird so weniger wahrscheinlich."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Display, entsperren"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Später"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Hebe den Finger an und lege ihn dann noch mal auf den Sensor"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Halte nacheinander beide Seiten der Fingerkuppe einen Moment lang auf den Sensor"</string>
@@ -1530,8 +1528,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Nicht verfügbar, weil der Modus „Schlafenszeit“ aktiviert ist"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Bildschirmschoner verwenden"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Beim Aufladen oder wenn in Dockingstation"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Während des Andockens und Aufladens"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Beim Aufladen"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Wenn in Dockingstation"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nie"</string>
@@ -2821,7 +2818,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Verlaufsdetails"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Akkunutzung"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Nutzung der letzten 24 Stunden abrufen"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Nutzung seit letzter voller Aufladung abrufen"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Nutzung seit letztem kompletten Aufladen"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Akkunutzung der App"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Details"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Energieverbrauch anpassen"</string>
@@ -2993,8 +2990,8 @@
     <string name="battery_screen_usage" msgid="90008745183187461">"Displaynutzung: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="6457305178016189330">"<xliff:g id="PERCENT">%1$s</xliff:g> durch <xliff:g id="APP">%2$s</xliff:g> verbraucht"</string>
     <string name="battery_overall_usage" msgid="8940140259734182014">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
-    <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
-    <string name="battery_last_full_charge" msgid="8308424441475063956">"Letzte vollständige Aufladung"</string>
+    <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"Verbrauchsdetails seit letztem kompletten Aufladen"</string>
+    <string name="battery_last_full_charge" msgid="8308424441475063956">"Letztes komplettes Aufladen"</string>
     <string name="battery_full_charge_last" msgid="465146408601016923">"Ungefähre Nutzungsdauer bei vollständiger Aufladung"</string>
     <string name="battery_footer_summary" msgid="8221691063048377342">"Die Daten zur Akkunutzung sind eine Schätzung und können sich je nach Verwendung ändern."</string>
     <string name="battery_detail_foreground" msgid="3312280147931093967">"Während aktiver Nutzung"</string>
@@ -3002,25 +2999,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Akkunutzung"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Seit letzter vollständiger Aufladung"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Akkunutzung verwalten"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Insgesamt <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> Akkunutzung im Hintergrund\nseit der letzten vollständigen Aufladung"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> Akkunutzung insgesamt • <xliff:g id="TIME_1">^2</xliff:g> im Hintergrund\nseit dem letzten kompletten Aufladen"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Insgesamt <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> Akkunutzung im Hintergrund\nin den letzten 24 Stunden"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Insgesamt <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> Akkunutzung im Hintergrund\nim Zeitraum <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Insgesamt weniger als eine Minute seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Weniger als eine Minute Akkunutzung insgesamt seit dem letzten kompletten Aufladen"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Insgesamt weniger als eine Minute in den letzten 24 Stunden"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Insgesamt weniger als eine Minute im Zeitraum <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Akkunutzung im Hintergrund weniger als eine Minute seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Weniger als eine Minute Akkunutzung im Hintergrund seit dem letzten kompletten Aufladen"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Akkunutzung im Hintergrund weniger als eine Minute in den letzten 24 Stunden"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Akkunutzung im Hintergrund weniger als eine Minute im Zeitraum <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> insgesamt seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> Akkunutzung insgesamt seit dem letzten kompletten Aufladen"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> insgesamt in den letzten 24 Stunden"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> insgesamt im Zeitraum <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> Akkunutzung im Hintergrund seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> Akkunutzung im Hintergrund seit dem letzten kompletten Aufladen"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> Akkunutzung im Hintergrund in den letzten 24 Stunden"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> Akkunutzung im Hintergrund im Zeitraum <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> insgesamt • Akkunutzung im Hintergrund weniger als eine Minute\nseit der letzten vollständigen Aufladung"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> Akkunutzung insgesamt • weniger als eine Minute im Hintergrund\nseit dem letzten kompletten Aufladen"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Insgesamt <xliff:g id="TIME">^1</xliff:g> • Akkunutzung im Hintergrund weniger als eine Minute\nin den letzten 24 Stunden"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Insgesamt <xliff:g id="TIME_0">^1</xliff:g> • Akkunutzung im Hintergrund weniger als eine Minute\nim Zeitraum <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Keine Nutzung seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Keine Nutzung seit der letzten vollständigen Aufladung"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Keine Nutzung in den letzten 24 Stunden"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Andere Nutzer"</string>
@@ -3059,11 +3056,11 @@
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"bei <xliff:g id="PERCENT">%1$s</xliff:g> Akku"</string>
     <string name="battery_percentage" msgid="1779934245963043490">"Ladestandanzeige in Prozent"</string>
     <string name="battery_percentage_description" msgid="2321465139126125541">"Ladestand in Statusleiste in Prozent anzeigen"</string>
-    <string name="battery_usage_chart_graph_hint_last_full_charge" msgid="6570336408060566877">"Akkustand seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_usage_chart_graph_hint_last_full_charge" msgid="6570336408060566877">"Akkustand seit dem letzten kompletten Aufladen"</string>
     <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Akkustand während der letzten 24 Stunden"</string>
-    <string name="battery_app_usage" msgid="8976453608783133770">"App-Verbrauch seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_app_usage" msgid="8976453608783133770">"App-Verbrauch seit letztem vollständigen Aufladen"</string>
     <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"App-Nutzung während der letzten 24 Stunden"</string>
-    <string name="battery_system_usage" msgid="1395943945140097585">"Systemverbrauch seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_system_usage" msgid="1395943945140097585">"Systemverbrauch seit dem letzten kompletten Aufladen"</string>
     <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systemnutzung während der letzten 24 Stunden"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"Systemnutzung im Zeitraum <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App-Nutzung im Zeitraum <xliff:g id="SLOT">%s</xliff:g>"</string>
@@ -3500,7 +3497,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> vom Gerät löschen"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Einstellungen für den Sperrbildschirm"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Nutzer vom Sperrbildschirm aus hinzufügen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Zu Administrator wechseln, wenn angedockt"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Dich selbst löschen?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Diesen Nutzer löschen?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Dieses Profil entfernen?"</string>
@@ -4213,8 +4211,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser App auf diesem Gerät."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser Kategorie auf diesem Gerät."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser Gruppe auf diesem Gerät."</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Diese App sendet keine Benachrichtigungen"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorien"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Andere"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -4624,9 +4621,9 @@
     <string name="high_power_desc" msgid="2753076899835765338">"Keine Optimierung bezüglich der Akkuleistung anwenden. Dein Akku entleert sich hierdurch möglicherweise schneller."</string>
     <string name="high_power_prompt_title" msgid="2574478825228409124">"Soll die App immer im Hintergrund ausgeführt werden?"</string>
     <string name="high_power_prompt_body" msgid="6029266540782139941">"Wenn du erlaubst, dass <xliff:g id="APP_NAME">%1$s</xliff:g> dauerhaft im Hintergrund ausgeführt wird, kann dies die Akkulaufzeit verringern. \n\nDu kannst das später unter „Einstellungen“ &gt; „Apps“ ändern."</string>
-    <string name="battery_summary" msgid="2491764359695671207">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> Verbrauch seit der letzten vollständigen Aufladung"</string>
+    <string name="battery_summary" msgid="2491764359695671207">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> Verbrauch seit dem letzten kompletten Aufladen"</string>
     <string name="battery_summary_24hr" msgid="7656033283282656551">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> Nutzung in den letzten 24 Stunden"</string>
-    <string name="no_battery_summary" msgid="5769159953384122003">"Kein Verbrauch seit dem letzten vollen Aufladen"</string>
+    <string name="no_battery_summary" msgid="5769159953384122003">"Kein Verbrauch seit dem letzten kompletten Aufladen"</string>
     <string name="no_battery_summary_24hr" msgid="6280079526797873842">"Keine Akkunutzung in den letzten 24 Stunden"</string>
     <string name="app_notification_preferences" msgid="2004680717999108725">"App-Einstellungen"</string>
     <string name="system_ui_settings" msgid="936169564323330967">"SystemUI-Tuner anzeigen"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index b2f8aaa..68ef041 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Ποτέ"</item>
-    <item msgid="5065465585332446709">"Μετά από 1 λεπτό"</item>
-    <item msgid="622807566366131941">"Μετά από 5 λεπτά"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 52148ef..c7fce34 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Το μοντέλο προσώπου θα διαγραφεί οριστικά και με ασφάλεια.\n\nΜετά τη διαγραφή, θα χρειαστείτε το PIN, το μοτίβο ή τον κωδικό πρόσβασης για να ξεκλειδώσετε το τηλέφωνό σας."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Χρησιμοποιήστε τη λειτουργία Ξεκλείδωμα με το πρόσωπο για το ξεκλείδωμα του τηλεφώνου σας."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Δακτυλικό αποτύπωμα"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Στη χρήση του Ξεκλειδώματος με δακτυλικό αποτύπωμα"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Δακτυλικό αποτύπωμα για επ. χρήση"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Διαχείριση μον.χαρακτ."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Χρήση δακτ. αποτυπωμ."</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Εγγραφή στο <xliff:g id="PERCENTAGE">%d</xliff:g> τοις εκατό"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Εγγραφή δακτυλικού αποτυπώματος <xliff:g id="PERCENTAGE">%d</xliff:g> τοις εκατό"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Προστέθηκε δακτυλ. αποτύπωμα"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Μπορείτε πλέον να χρησιμοποιείτε το δακτυλικό αποτύπωμά σας για να ξεκλειδώσετε το tablet σας ή να επαληθεύσετε την ταυτότητά σας, για παράδειγμα κατά τη σύνδεση σε εφαρμογές ή την έγκριση μιας αγοράς."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Μπορείτε πλέον να χρησιμοποιείτε το δακτυλικό σας αποτύπωμα για να ξεκλειδώνετε το tablet σας ή για να επαληθεύετε την ταυτότητά σας, για παράδειγμα, όταν συνδέεστε σε εφαρμογές."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Μπορείτε πλέον να χρησιμοποιείτε το δακτυλικό σας αποτύπωμα για να ξεκλειδώνετε τη συσκευή σας ή να επαληθεύετε την ταυτότητά σας, για παράδειγμα, όταν συνδέεστε σε εφαρμογές"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Μπορείτε πλέον να χρησιμοποιείτε το δακτυλικό σας αποτύπωμα για να ξεκλειδώνετε το τηλέφωνό σας ή για να επαληθεύετε την ταυτότητά σας, για παράδειγμα, όταν συνδέεστε σε εφαρμογές"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Ξεκλείδωμα μόνο όταν η οθόνη είναι ενεργή"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Η οθόνη πρέπει να είναι ενεργή για να μπορέσετε να ξεκλειδώσετε με το δακτυλικό αποτύπωμά σας. Έτσι είναι λιγότερο πιθανό το ακούσιο ξεκλείδωμα."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Οθόνη, Ξεκλείδωμα"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Αργότερα"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Ανασηκώστε και αγγίξτε ξανά"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Τοποθετήστε τη μία πλευρά του δακτυλικού σας αποτυπώματος στον αισθητήρα και αγγίξτε παρατεταμένα, μετά τοποθετήστε την άλλη πλευρά."</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Λεπτομέρειες ιστορικού"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Χρήση μπαταρίας"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Προβολή χρήσης των τελευταίων 24 ωρών"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Προβ. χρήσης από τελευταία πλήρη φόρτιση"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Προβολή χρήσης από τελευτ. πλήρη φόρτιση"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Χρήση μπαταρίας εφαρμογής"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Λεπτομέρειες χρήσης"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Προσαρμογή χρήσης ισχύος"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Χρήση της μπαταρίας"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Από την πλήρη φόρτιση"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Διαχείριση χρήσης μπαταρίας"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> συνολικά • <xliff:g id="TIME_1">^2</xliff:g> στο παρασκήνιο\nαπό την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> συνολικά • <xliff:g id="TIME_1">^2</xliff:g> στο παρασκήνιο\nαπό την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> συνολικά • <xliff:g id="TIME_1">^2</xliff:g> στο παρασκήνιο\nγια τις προηγούμενες 24 ώρες"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> συνολικά • <xliff:g id="TIME_1">^2</xliff:g> στο παρασκήνιο\nκατά το διάστημα <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Λιγότερο από ένα λεπτό συνολικά από την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Λιγότερο από ένα λεπτό συνολικά από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Λιγότερο από ένα λεπτό συνολικά τις τελευταίες 24 ώρες"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Λιγότερο από ένα λεπτό συνολικά κατά το διάστημα <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Λιγότερο από ένα λεπτό στο παρασκήνιο από την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Λιγότερο από ένα λεπτό στο παρασκήνιο από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Λιγότερο από ένα λεπτό στο παρασκήνιο τις τελευταίες 24 ώρες"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Λιγότερο από ένα λεπτό στο παρασκήνιο κατά το διάστημα <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> συνολικά από την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> συνολικά από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> συνολικά τις τελευταίες 24 ώρες"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> συνολικά κατά το διάστημα <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> στο παρασκήνιο από την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> στο παρασκήνιο από την τελευταία φόρτιση"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> στο παρασκήνιο τις τελευταίες 24 ώρες"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> στο παρασκήνιο κατά το διάστημα <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> συνολικά • λιγότερο από ένα λεπτό στο παρασκήνιο\nαπό την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> συνολικά • λιγότερο από ένα λεπτό στο παρασκήνιο\nαπό την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> συνολικά • λιγότερο από ένα λεπτό στο παρασκήνιο\nτις προηγούμενες 24 ώρες"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> συνολικά • λιγότερο από ένα λεπτό στο παρασκήνιο\nκατά το διάστημα <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Καμία χρήση από την τελευταία πλήρη φόρτιση"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Δεν χρησιμοποιήθηκε από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Καμία χρήση τις τελευταίες 24 ώρες"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Άλλοι χρήστες"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Διαγρ. <xliff:g id="USER_NAME">%1$s</xliff:g> από τη συσκ."</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Ρυθμίσεις κλειδώματος οθόνης"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Προσθήκη χρηστών από την οθόνη κλειδώματος"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Αλλαγή σε διαχειριστή όταν είναι στη βάση σύνδεσης"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Διαγραφή του εαυτού σας;"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Να διαγραφεί ο χρήστης;"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Κατάργηση του προφίλ;"</string>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index f8723b8..278609d 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Never"</item>
-    <item msgid="5065465585332446709">"After one minute"</item>
-    <item msgid="622807566366131941">"After five minutes"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 09876c5..289c5e2 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Enrolled <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps or approve a purchase"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Now you can use your fingerprint to unlock your device or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Unlock only when screen is on"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"The screen must be on before you can unlock with your fingerprint. This makes accidental unlocking less likely."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Screen, unlock"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"History details"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Battery usage"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"View usage for past 24 hours"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"View usage from last full charge"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"View usage since last full charge"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"App battery usage"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Battery usage"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Since full charge"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Manage battery usage"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfrom last full charge"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nsince last full charge"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor past 24 hours"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total less than a minute from last full charge"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total less than a minute since last full charge"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total less than a minute for past 24 hr"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Background less than a minute from last full charge"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Background less than a minute since last full charge"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Background less than a minute for past 24 hr"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Background less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> total from last full charge"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> total since last full charge"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> total for past 24 hr"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> total for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> background from last full charge"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> background since last full charge"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> background for past 24 hr"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> background for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfrom last full charge"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nsince last full charge"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfor past 24 hours"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> total • background less than a minute\nfor <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"No usage from last full charge"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"No usage since last full charge"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"No usage for past 24 hr"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Other users"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lock screen settings"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Add users from lock screen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Switch to admin user when docked"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Delete this user?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remove this profile?"</string>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 8ccb9e2..da349da 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -119,7 +119,7 @@
     <item msgid="66312817817365647">"Invited"</item>
     <item msgid="4463567967438038210">"Unsuccessful"</item>
     <item msgid="6556827947082659801">"Available"</item>
-    <item msgid="6096962300722555553">"Out of range"</item>
+    <item msgid="6096962300722555553">"Out-of-range"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="6697785880436838464">"2 minutes"</item>
@@ -128,7 +128,7 @@
     <item msgid="4241913314075719627">"Never time out"</item>
   </string-array>
   <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="4792793579224104167">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="4792793579224104167">"Use System Default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
     <item msgid="5818942631838356082">"1"</item>
     <item msgid="4804155564025402919">"2"</item>
     <item msgid="7123296338505723878">"3"</item>
@@ -242,7 +242,7 @@
     <item msgid="1908944516631132130">"modify call log"</item>
     <item msgid="9066115715905100138">"read calendar"</item>
     <item msgid="1664720478157892566">"modify calendar"</item>
-    <item msgid="5478277451617814822">"Wi-Fi scan"</item>
+    <item msgid="5478277451617814822">"wi-fi scan"</item>
     <item msgid="2429454210217003798">"notification"</item>
     <item msgid="8909068846471624576">"cell scan"</item>
     <item msgid="2527973826970434181">"call phone"</item>
@@ -271,7 +271,7 @@
     <item msgid="3378000878531336372">"media volume"</item>
     <item msgid="5272927168355895681">"alarm volume"</item>
     <item msgid="4422070755065530548">"notification volume"</item>
-    <item msgid="3250654589277825306">"Bluetooth volume"</item>
+    <item msgid="3250654589277825306">"bluetooth volume"</item>
     <item msgid="4212187233638382465">"keep awake"</item>
     <item msgid="5099026183238335900">"monitor location"</item>
     <item msgid="2297727967385895059">"monitor high power location"</item>
@@ -289,7 +289,7 @@
     <item msgid="2986821801246709737">"process outgoing call"</item>
     <item msgid="2702338156976571452">"fingerprint"</item>
     <item msgid="7925495329948404955">"body sensors"</item>
-    <item msgid="8163066895749904470">"read mobile broadcasts"</item>
+    <item msgid="8163066895749904470">"read cell broadcasts"</item>
     <item msgid="7621394050624063528">"mock location"</item>
     <item msgid="37519917674959757">"read storage"</item>
     <item msgid="3868809525697401379">"write storage"</item>
@@ -356,7 +356,7 @@
     <item msgid="3053060162752878562">"Process outgoing call"</item>
     <item msgid="4480721672278100858">"Fingerprint"</item>
     <item msgid="7883743426029759112">"Body sensors"</item>
-    <item msgid="2546206711741159825">"Read mobile broadcasts"</item>
+    <item msgid="2546206711741159825">"Read cell broadcasts"</item>
     <item msgid="2363460595607829243">"Mock location"</item>
     <item msgid="3778165903878569143">"Read storage"</item>
     <item msgid="555939881912035315">"Write storage"</item>
@@ -413,7 +413,7 @@
     <item msgid="5410164687403735103">"Black on white"</item>
     <item msgid="1119043472912497241">"Yellow on black"</item>
     <item msgid="2836895041823327816">"Yellow on blue"</item>
-    <item msgid="747238414788976867">"Customise"</item>
+    <item msgid="747238414788976867">"Custom"</item>
   </string-array>
   <string-array name="accessibility_button_location_selector_titles">
     <item msgid="6485511780196327736">"Floating over other apps"</item>
@@ -429,9 +429,9 @@
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="6621806338070912611">"PPTP VPN"</item>
-    <item msgid="2552427673212085780">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="2552427673212085780">"L2TP/IPSec VPN with pre-shared keys"</item>
     <item msgid="7378096704485168082">"L2TP/IPSec VPN with certificates"</item>
-    <item msgid="3792393562235791509">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="3792393562235791509">"IPSec VPN with pre-shared keys and Xauth authentication"</item>
     <item msgid="2484564813864139237">"IPSec VPN with certificates and Xauth authentication"</item>
     <item msgid="68918911194507915">"IPSec VPN with certificates and hybrid authentication"</item>
     <item msgid="4631647675167100375">"IKEv2/IPSec VPN with certificates and username/password authentication"</item>
@@ -444,7 +444,7 @@
   </string-array>
   <string-array name="vpn_states">
     <item msgid="2262719249581510939">"Disconnected"</item>
-    <item msgid="9141074028293812365">"Initialising..."</item>
+    <item msgid="9141074028293812365">"Initializing…"</item>
     <item msgid="2234425878608626285">"Connecting…"</item>
     <item msgid="27547778933579155">"Connected"</item>
     <item msgid="893506841727300393">"Timeout"</item>
@@ -542,7 +542,7 @@
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
     <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
-    <item msgid="2947411877551747693">"LTE/WCDMA"</item>
+    <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
     <item msgid="7662033849563993380">"TDSCDMA/WCDMA"</item>
     <item msgid="1030644331822315228">"LTE/TDSCDMA"</item>
@@ -586,9 +586,9 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Never"</item>
-    <item msgid="5065465585332446709">"After one minute"</item>
-    <item msgid="622807566366131941">"After five minutes"</item>
+  <string-array name="switch_to_dock_user_when_docked_timeout_entries">
+    <item msgid="3211660022507486536">"Never"</item>
+    <item msgid="7025253383416830453">"After 1 minute"</item>
+    <item msgid="1574040255478150028">"After 5 minutes"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a27ab57..a8b4aff 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -32,17 +32,17 @@
     <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Please enable developer options first."</string>
     <string name="header_category_wireless_networks" msgid="303445626075235229">"Wireless &amp; networks"</string>
     <string name="header_category_system" msgid="1665516346845259058">"System"</string>
-    <string name="radioInfo_service_in" msgid="9088637745836646271">"In service"</string>
-    <string name="radioInfo_service_out" msgid="1868347333892403287">"Out of service"</string>
+    <string name="radioInfo_service_in" msgid="9088637745836646271">"In Service"</string>
+    <string name="radioInfo_service_out" msgid="1868347333892403287">"Out of Service"</string>
     <string name="radioInfo_service_emergency" msgid="6838935881091760942">"Emergency Calls Only"</string>
-    <string name="radioInfo_service_off" msgid="6184928420860868571">"Radio off"</string>
+    <string name="radioInfo_service_off" msgid="6184928420860868571">"Radio Off"</string>
     <string name="radioInfo_roaming_in" msgid="8892550453644088692">"Roaming"</string>
-    <string name="radioInfo_roaming_not" msgid="3137594549464975054">"Not roaming"</string>
+    <string name="radioInfo_roaming_not" msgid="3137594549464975054">"Not Roaming"</string>
     <string name="radioInfo_data_disconnected" msgid="362604130117666924">"Disconnected"</string>
     <string name="radioInfo_data_connecting" msgid="7280819598028917888">"Connecting"</string>
     <string name="radioInfo_data_connected" msgid="8816467971633020141">"Connected"</string>
     <string name="radioInfo_data_suspended" msgid="2001254415431299603">"Suspended"</string>
-    <string name="radioInfo_unknown" msgid="2892562356748600367">"unknown"</string>
+    <string name="radioInfo_unknown" msgid="2892562356748600367">"Unknown"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="1816306320988638382">"Unmount USB storage"</string>
     <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"Unmount SD card"</string>
     <string name="sdcard_format" product="nosdcard" msgid="3248760426252305366">"Erase USB storage"</string>
@@ -53,22 +53,22 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Make smaller"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Make larger"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="3440951924928594520">"Use auto-rotate"</string>
-    <string name="smart_rotate_text_headline" msgid="5878008933992951904">"Face detection uses the front-facing camera to improve auto-rotate accuracy. Images are never stored or sent to Google."</string>
+    <string name="smart_rotate_text_headline" msgid="5878008933992951904">"Face Detection uses the front-facing camera to improve auto-rotate accuracy. Images are never stored or sent to Google."</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sample text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapter 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_size_preview_text_body" msgid="3323732544011097199">"Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses or animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
+    <string name="font_size_preview_text_body" msgid="3323732544011097199">"Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seeemed happy and contented and prosperous."</string>
     <string name="font_size_save" msgid="206892409190870726">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="6071836464978826249">"USB storage"</string>
     <string name="sdcard_setting" product="default" msgid="3713462184783824923">"SD card"</string>
     <string name="bluetooth" msgid="8898478620943459654">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="4798961627677790935">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8122823110652921674">"Visible to all Bluetooth devices nearby"</string>
+    <string name="bluetooth_is_discoverable" msgid="4798961627677790935">"Visible to all nearby Bluetooth devices (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8122823110652921674">"Visible to all nearby Bluetooth devices"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="6181960579190879601">"Not visible to other Bluetooth devices"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="3574936359739213455">"Only visible to paired devices"</string>
     <string name="bluetooth_visibility_timeout" msgid="7611781967900196353">"Visibility timeout"</string>
-    <string name="bluetooth_lock_voice_dialing" msgid="7405038248936935186">"Lock voice dialling"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4959591522483403402">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="7405038248936935186">"Lock voice dialing"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4959591522483403402">"Prevent use of the bluetooth dialer when the screen is locked"</string>
     <string name="bluetooth_devices" msgid="1063177983261608277">"Bluetooth devices"</string>
     <string name="bluetooth_device_name" msgid="1294669733490268384">"Device name"</string>
     <string name="bluetooth_device_details" msgid="630702184344217832">"Device settings"</string>
@@ -82,18 +82,18 @@
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="336622948210457991">"Your tablet will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="6944790936166852428">"Your device will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4173740094381092185">"Disconnect"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="909734990821975673">"You don’t have permission to change Bluetooth settings."</string>
     <string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
-    <string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
+    <string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
     <string name="bluetooth_pair_right_ear_button" msgid="3979894494803078852">"Pair right ear"</string>
     <string name="bluetooth_pair_left_ear_button" msgid="1019938875726073791">"Pair left ear"</string>
     <string name="bluetooth_pair_other_ear_dialog_title" msgid="3814943511999984012">"Pair your other ear"</string>
-    <string name="bluetooth_pair_other_ear_dialog_left_ear_message" msgid="7936892941892347102">"Your left hearing aid is connected.\n\nTo pair the right one, make sure that it’s turned on and ready to pair."</string>
-    <string name="bluetooth_pair_other_ear_dialog_right_ear_message" msgid="8242208936062915941">"Your right hearing aid is connected.\n\nTo pair the left one, make sure that it’s turned on and ready to pair."</string>
+    <string name="bluetooth_pair_other_ear_dialog_left_ear_message" msgid="7936892941892347102">"Your left hearing aid is connected.\n\nTo pair the right one, make sure it’s turned on and ready to pair."</string>
+    <string name="bluetooth_pair_other_ear_dialog_right_ear_message" msgid="8242208936062915941">"Your right hearing aid is connected.\n\nTo pair the left one, make sure it’s turned on and ready to pair."</string>
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Pair right ear"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Pair left ear"</string>
     <string name="bluetooth_screen_related" msgid="7976543255501825536">"Related"</string>
-    <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
+    <string name="bluetooth_is_visible_message" msgid="3811631869768157387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="4782330594323261630">"Phone\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="1257226691967432025">"Tablet\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="device" msgid="2863536947810007600">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -129,15 +129,15 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="4047444317445386579">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="4922952478824372605">"An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="1381582950049639439">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
-    <string name="bluetooth_turning_on" msgid="3842613808709024730">"Turning on Bluetooth…"</string>
+    <string name="bluetooth_turning_on" msgid="3842613808709024730">"Turning Bluetooth on…"</string>
     <string name="bluetooth_turning_off" msgid="7406309124247701148">"Turning Bluetooth off…"</string>
     <string name="bluetooth_connection_permission_request" msgid="8793131019383198861">"Bluetooth connection request"</string>
     <string name="bluetooth_connection_notif_message" msgid="6087344980352898209">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="2537152772549874391">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="1085102844577089889">"Phone book access request"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="7153531868579789993">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your contacts and call history. Give access to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>?"</string>
-    <string name="bluetooth_remember_choice" msgid="173821849670438110">"Don\'t ask again"</string>
-    <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"Don\'t ask again"</string>
+    <string name="bluetooth_remember_choice" msgid="173821849670438110">"Don’t ask again"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"Don’t ask again"</string>
     <string name="bluetooth_map_request" msgid="8664081227240707479">"Message access request"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"SIM access request"</string>
@@ -151,7 +151,7 @@
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"Allow your phone to communicate with nearby Bluetooth devices"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"Disable Bluetooth A2DP hardware offload"</string>
     <string name="bluetooth_disable_le_audio_hw_offload" msgid="4656853795514691257">"Disable Bluetooth LE audio hardware offload"</string>
-    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restart device?"</string>
+    <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"Restart Device?"</string>
     <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"You need to restart your device to change this setting."</string>
     <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"Restart"</string>
     <string name="bluetooth_disable_hw_offload_dialog_cancel" msgid="3663690305043973720">"Cancel"</string>
@@ -167,7 +167,7 @@
     <string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Previously connected"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth turned on"</string>
     <string name="previous_connected_see_all" msgid="7759413145713251328">"See all"</string>
-    <string name="date_and_time" msgid="1788358029823431692">"Date and time"</string>
+    <string name="date_and_time" msgid="1788358029823431692">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1450780665958642147">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (1733806423295725392) -->
     <skip />
@@ -185,18 +185,18 @@
     <string name="proxy_hostname_label" msgid="5504327742505848063">"Proxy hostname"</string>
     <string name="proxy_error" msgid="3615905975598084126">"Attention"</string>
     <string name="proxy_error_dismiss" msgid="4207430265140873078">"OK"</string>
-    <string name="proxy_error_invalid_host" msgid="3814412792702059247">"The hostname that you typed isn\'t valid."</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="6096353559936226599">"The exclusion list that you\'ve typed isn\'t properly formatted. Type a comma-separated list of excluded domains."</string>
+    <string name="proxy_error_invalid_host" msgid="3814412792702059247">"The hostname you typed isn’t valid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="6096353559936226599">"The exclusion list you typed isn’t properly formatted. Type a comma-separated list of excluded domains."</string>
     <string name="proxy_error_empty_port" msgid="4250295137005082992">"You need to complete the port field."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8886572276450900049">"The port field must be empty if the host field is empty."</string>
-    <string name="proxy_error_invalid_port" msgid="2830054691770209166">"The port that you typed is not valid."</string>
-    <string name="proxy_warning_limited_support" msgid="3277104160797351942">"The HTTP proxy is used by the browser but may not be used by other apps."</string>
+    <string name="proxy_error_invalid_port" msgid="2830054691770209166">"The port you typed isn’t valid."</string>
+    <string name="proxy_warning_limited_support" msgid="3277104160797351942">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
     <string name="proxy_url_title" msgid="3502625766036404073">"PAC URL: "</string>
     <string name="radio_info_ping_hostname_v4" msgid="4790577760885127088">"Ping Hostname(www.google.com) IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="8327436534663560713">"Ping Hostname(www.google.com) IPv6:"</string>
-    <string name="radio_info_http_client_test" msgid="5673975677271544085">"HTTP Client test:"</string>
-    <string name="ping_test_label" msgid="265427033290391845">"Run ping test"</string>
-    <string name="sdcard_changes_instructions" msgid="2331969501845866957">"Changes take effect when the USB cable is reconnected."</string>
+    <string name="radio_info_http_client_test" msgid="5673975677271544085">"HTTP Client Test:"</string>
+    <string name="ping_test_label" msgid="265427033290391845">"Run Ping Test"</string>
+    <string name="sdcard_changes_instructions" msgid="2331969501845866957">"Changes take effect when USB cable is reconnected."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="129059989000252994">"Enable USB mass storage"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="5298511430610207103">"Total bytes:"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="6189761476582690998">"USB storage not mounted."</string>
@@ -204,8 +204,8 @@
     <string name="sdcard_settings_available_bytes_label" msgid="7721283102767669004">"Available bytes:"</string>
     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"USB storage is being used as a mass storage device."</string>
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"SD card is being used as a mass storage device."</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"It is now safe to remove the USB storage."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"It is now safe to remove the SD card."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"It’s now safe to remove the USB storage."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"It’s now safe to remove the SD card."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="209564009449909311">"USB storage was removed while still in use!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="6817342973919819392">"SD card was removed while still in use!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="5646588579332741943">"Used bytes:"</string>
@@ -219,10 +219,10 @@
     <string name="locale_remove_menu" msgid="3521546263421387474">"Remove"</string>
     <string name="add_a_language" msgid="2126220398077503271">"Add a language"</string>
     <string name="app_locale_preference_title" msgid="5513627099300360232">"Language"</string>
-    <string name="locale_picker_category_title" msgid="6212064706962721255">"Preferred language"</string>
-    <string name="app_locales_picker_menu_title" msgid="3412278173933199721">"App languages"</string>
+    <string name="locale_picker_category_title" msgid="6212064706962721255">"Preferred Language"</string>
+    <string name="app_locales_picker_menu_title" msgid="3412278173933199721">"App Languages"</string>
     <string name="app_locale_picker_summary" msgid="6742557329924446252">"Set the language for each app"</string>
-    <string name="app_locale_picker_title" msgid="8423365003726200684">"App language"</string>
+    <string name="app_locale_picker_title" msgid="8423365003726200684">"App Language"</string>
     <string name="suggested_app_locales_title" msgid="8898358282377369405">"Suggested languages"</string>
     <string name="all_supported_app_locales_title" msgid="5479289964316009026">"All languages"</string>
     <string name="preference_of_system_locale_title" msgid="8067226276038751504">"System language"</string>
@@ -275,7 +275,7 @@
     <string name="roaming_reenable_title" msgid="770824950144026180">"Allow data roaming?"</string>
     <string name="networks" msgid="5184501333492775095">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="1669911795517995916">"Choose a network operator"</string>
-    <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date and time"</string>
+    <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date &amp; time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Set date, time, time zone, &amp; formats"</string>
     <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
@@ -296,7 +296,7 @@
     <string name="zone_info_offset_and_name" msgid="3960192548990990152">"<xliff:g id="TIME_TYPE">%2$s</xliff:g> (<xliff:g id="OFFSET">%1$s</xliff:g>)"</string>
     <string name="zone_info_footer" msgid="7004693956837388129">"Uses <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. <xliff:g id="DST_TIME_TYPE">%2$s</xliff:g> starts on <xliff:g id="TRANSITION_DATE">%3$s</xliff:g>."</string>
     <string name="zone_info_footer_no_dst" msgid="8399585343328811158">"Uses <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. No daylight savings time."</string>
-    <string name="zone_time_type_dst" msgid="9189689342265305808">"British Summer Time (also known as daylight savings time)"</string>
+    <string name="zone_time_type_dst" msgid="9189689342265305808">"Daylight savings time"</string>
     <string name="zone_time_type_standard" msgid="6865420715430680352">"Standard time"</string>
     <string name="zone_menu_by_region" msgid="2963565278710225652">"Select by region"</string>
     <string name="zone_menu_by_offset" msgid="1257702747474426745">"Select by UTC offset"</string>
@@ -314,23 +314,23 @@
     <string name="trust_lost_locks_screen_summary" msgid="718374221849537361">"If enabled, the device will lock when the last trust agent loses trust"</string>
     <string name="owner_info_settings_summary" msgid="347238313388083297">"None"</string>
     <string name="owner_info_settings_status" msgid="7488764871758677862">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"e.g. Joe\'s Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"E.g., Joe’s Android."</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
-      <item quantity="one">On – <xliff:g id="COUNT_0">%1$d</xliff:g> app has access to location</item>
+      <item quantity="other">On - <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
+      <item quantity="one">On - <xliff:g id="COUNT_0">%1$d</xliff:g> app has access to location</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Loading…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
     <string name="location_settings_footer_location_off" msgid="8568995909147566720">"Location access is off for apps and services. Your device location may still be sent to emergency responders when you call or text an emergency number."</string>
-    <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"Learn more about location settings."</string>
+    <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"Learn more about Location Settings."</string>
     <string name="account_settings_title" msgid="9138880127246241885">"Accounts"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"Security"</string>
-    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encryption and credentials"</string>
+    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Encryption &amp; credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"Phone encrypted"</string>
     <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"Phone not encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"Device encrypted"</string>
@@ -343,7 +343,7 @@
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Not available"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Security status"</string>
     <string name="security_dashboard_summary" msgid="7571035662779425918">"Screen lock, Find My Device, app security"</string>
-    <string name="safety_center_title" msgid="7732397372178774777">"Security and privacy"</string>
+    <string name="safety_center_title" msgid="7732397372178774777">"Security &amp; privacy"</string>
     <string name="safety_center_summary" msgid="3554867379951053869">"App security, device lock, permissions"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Tap to set up face"</string>
@@ -367,15 +367,15 @@
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_vision" msgid="7700394302162170363"></string>
     <string name="security_settings_face_enroll_introduction_cancel" msgid="7551159644361639436">"Cancel"</string>
-    <string name="security_settings_face_enroll_introduction_no_thanks" msgid="1820618982738898717">"No, thanks"</string>
+    <string name="security_settings_face_enroll_introduction_no_thanks" msgid="1820618982738898717">"No thanks"</string>
     <string name="security_settings_face_enroll_introduction_agree" msgid="6319476573697497750">"I agree"</string>
     <string name="security_settings_face_enroll_introduction_more" msgid="1970820298889710532">"More"</string>
     <string name="security_settings_face_enroll_introduction_title" msgid="7061610077237098046">"Unlock with your face"</string>
     <string name="security_settings_face_enroll_consent_introduction_title" msgid="3942331854413767814">"Allow face unlock"</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="5903924766168353113">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_introduction_message" product="default" msgid="3015751486939484934">"Use your face to unlock your phone, authorize purchases or sign in to apps."</string>
-    <string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="6144528803097608850">"Use your face to unlock your tablet, authorise purchases or sign in to apps."</string>
-    <string name="security_settings_face_enroll_introduction_message" product="device" msgid="8600301257170347509">"Use your face to unlock your device, authorise purchases or sign in to apps."</string>
+    <string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="6144528803097608850">"Use your face to unlock your tablet, authorize purchases, or sign in to apps."</string>
+    <string name="security_settings_face_enroll_introduction_message" product="device" msgid="8600301257170347509">"Use your face to unlock your device, authorize purchases, or sign in to apps."</string>
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="3708441779746110890">"Allow your child to use their face to unlock their phone"</string>
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="8406386084543310653">"Allow your child to use their face to unlock their tablet"</string>
     <string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="5001499879151444125">"Allow your child to use their face to unlock their device"</string>
@@ -420,15 +420,15 @@
     <string name="security_settings_face_enroll_introduction_control_consent_message" product="default" msgid="4658082872829249850"></string>
     <string name="security_settings_face_enroll_introduction_control_consent_message" product="tablet" msgid="4658082872829249850"></string>
     <string name="security_settings_face_enroll_introduction_control_consent_message" product="device" msgid="4658082872829249850"></string>
-    <string name="security_settings_face_enroll_repeat_title" msgid="4446229670377418717">"Centre your face in the circle"</string>
+    <string name="security_settings_face_enroll_repeat_title" msgid="4446229670377418717">"Center your face in the circle"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="5568617401632528567">"Skip"</string>
     <string name="face_add_max" msgid="4578405795494514876">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
     <string name="face_intro_error_max" msgid="2474735057709291626">"You’ve added the maximum number of faces"</string>
     <string name="face_intro_error_unknown" msgid="1626057493054989995">"Can’t add more faces"</string>
-    <string name="security_settings_face_enroll_error_dialog_title" msgid="2460820099922775936">"Enrolment was not completed"</string>
+    <string name="security_settings_face_enroll_error_dialog_title" msgid="2460820099922775936">"Enrollment was not completed"</string>
     <string name="security_settings_face_enroll_dialog_ok" msgid="1674650455786434426">"OK"</string>
-    <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="7768349698547951750">"Face enrolment time limit reached. Try again."</string>
-    <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"Face enrolment didn\'t work."</string>
+    <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="7768349698547951750">"Face enrollment time limit reached. Try again."</string>
+    <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"Face enrollment didn\'t work."</string>
     <string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"All set. Looking good."</string>
     <string name="security_settings_face_enroll_done" msgid="3048687969498187442">"Done"</string>
     <string name="security_settings_face_enroll_should_re_enroll_title" msgid="6835778900387289683">"Improve Face Unlock performance"</string>
@@ -436,9 +436,9 @@
     <string name="security_settings_face_enroll_must_re_enroll_title" msgid="4421818770682557621">"Set up Face Unlock again"</string>
     <string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"Improve security and performance"</string>
     <string name="security_settings_face_enroll_improve_face_alert_title" msgid="6194184776580066012">"Set up Face Unlock"</string>
-    <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern or password to unlock your phone or for authentication in apps."</string>
-    <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern or password to unlock your phone or for authentication in apps."</string>
-    <string name="security_settings_face_settings_use_face_category" msgid="1638314154119800188">"Use Face Unlock to"</string>
+    <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern, or password to unlock your phone or for authentication in apps."</string>
+    <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone or for authentication in apps."</string>
+    <string name="security_settings_face_settings_use_face_category" msgid="1638314154119800188">"Use Face Unlock for"</string>
     <string name="security_settings_face_settings_preferences_category" msgid="7628929873407280453">"When using Face Unlock"</string>
     <string name="security_settings_face_settings_require_attention" msgid="4395309855914391104">"Require eyes to be open"</string>
     <string name="security_settings_face_settings_require_attention_details" msgid="2546230511769544074">"To unlock the phone, your eyes must be open"</string>
@@ -449,8 +449,8 @@
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Use your face to unlock your phone or for authentication in apps, like when you sign in or approve a purchase.\n\nKeep in mind:\nYou can only have one face set up at a time. To add another face, delete the current one.\n\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, like an identical sibling."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Use your face to unlock your phone or for authentication in apps, like when you sign in or approve a purchase.\n\nKeep in mind:\nYou can only have one face set up at a time. To add another face, delete the current one.\n\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, like an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Delete face model?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="916131485988121592">"Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern or password to unlock your phone or for authentication in apps."</string>
-    <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern or password to unlock your phone."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="916131485988121592">"Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern, or password to unlock your phone or for authentication in apps."</string>
+    <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern, or password to unlock your phone."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Use Face Unlock to unlock your phone"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingerprint"</string>
     <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"When using Fingerprint Unlock"</string>
@@ -465,73 +465,73 @@
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Set up your fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"Allow Fingerprint Unlock"</string>
+    <string name="security_settings_fingerprint_enroll_consent_introduction_title" msgid="2278592030102282364">"Allow fingerprint unlock"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Use your fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet" msgid="1533352560544756928">"Use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps or approve a purchase."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="device" msgid="3570866595300511932">"Use your fingerprint to unlock your device or verify that it’s you, like when you sign in to apps or approve a purchase."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default" msgid="8539442240212670385">"Use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps or approve a purchase."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="1833139688278350628">"Allow your child to use their fingerprint to unlock their phone or verify that it’s them. This happens when they sign in to apps, approve a purchase and more."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="9019236661560266282">"Allow your child to use their fingerprint to unlock their tablet or verify that it’s them. This happens when they sign in to apps, approve a purchase and more."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="1131446458892188764">"Allow your child to use their fingerprint to unlock their device or verify that it’s them. This happens when they sign in to apps, approve a purchase and more."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"You\'re in control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet" msgid="1533352560544756928">"Use your fingerprint to unlock your tablet or verify it’s you, like when you sign in to apps or approve a purchase."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="device" msgid="3570866595300511932">"Use your fingerprint to unlock your device or verify it’s you, like when you sign in to apps or approve a purchase."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default" msgid="8539442240212670385">"Use your fingerprint to unlock your phone or verify it’s you, like when you sign in to apps or approve a purchase."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="1833139688278350628">"Allow your child to use their fingerprint to unlock their phone or verify it’s them. This happens when they sign in to apps, approve a purchase, and more."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="9019236661560266282">"Allow your child to use their fingerprint to unlock their tablet or verify it’s them. This happens when they sign in to apps, approve a purchase, and more."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="1131446458892188764">"Allow your child to use their fingerprint to unlock their device or verify it’s them. This happens when they sign in to apps, approve a purchase, and more."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"You’re in control"</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"You and your child are in control"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Bear in mind"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"The data recorded by fingerprint is stored securely and never leaves your phone. You can delete your data at any time in Settings."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Keep in mind"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"The data recorded by Fingerprint is stored securely and never leaves your phone. You can delete your data anytime in Settings."</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Your phone will occasionally use your recent fingerprint images to create improved fingerprint models."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organization’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No thanks"</string>
     <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="4068276083536421828">"I agree"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Skip fingerprint?"</string>
-    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in Settings."</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"When you see this icon, use your fingerprint for authentication, like when you sign in to apps or approve a purchase"</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Bear in mind"</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Keep in mind"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default" msgid="5824014348182478279">"Using your fingerprint to unlock your phone may be less secure than a strong pattern or PIN"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="tablet" msgid="3024180694355527323">"Using your fingerprint to unlock your tablet may be less secure than a strong pattern or PIN"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="device" msgid="150132643609189029">"Using your fingerprint to unlock your device may be less secure than a strong pattern or PIN"</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"How it works"</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Fingerprint Unlock creates a unique model of your fingerprint to verify that it’s you. To create this fingerprint model during setup, you will take images of your fingerprint from different positions."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Fingerprint Unlock creates a unique model of your child’s fingerprint to verify that it’s them. To create this fingerprint model during setup, they will take images of their fingerprint from different positions."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Fingerprint Unlock creates a unique model of your fingerprint to verify it’s you. To create this fingerprint model during setup, you will take images of your fingerprint from different positions."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Fingerprint Unlock creates a unique model of your child’s fingerprint to verify it’s them. To create this fingerprint model during setup, they will take images of their fingerprint from different positions."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="default" msgid="4729142136478078228">"When you use Pixel Imprint, images are used to update your fingerprint model. Images used to create your fingerprint model are never stored, but the fingerprint model is stored securely on your phone and never leaves the phone. All processing occurs securely on your phone."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="tablet" msgid="7537431055496985904">"When you use Pixel Imprint, images are used to update your fingerprint model. Images used to create your fingerprint model are never stored, but the fingerprint model is stored securely on your tablet and never leaves the tablet. All processing occurs securely on your tablet."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="device" msgid="1392098506793837697">"When you use Pixel Imprint, images are used to update your fingerprint model. Images used to create your fingerprint model are never stored, but the fingerprint model is stored securely on your device and never leaves the device. All processing occurs securely on your device."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="default" msgid="5908959250804145997">"When they use Pixel Imprint, images are used to update their fingerprint model. Images used to create your child’s fingerprint model are never stored, but the fingerprint model is stored securely on the phone and never leaves the phone. All processing occurs securely on the phone."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="tablet" msgid="530891604602839577">"When they use Pixel Imprint, images are used to update their fingerprint model. Images used to create your child’s fingerprint model are never stored, but the fingerprint model is stored securely on the tablet and never leaves the tablet. All processing occurs securely on the tablet."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="device" msgid="1735767057693277593">"When they use Pixel Imprint, images are used to update their fingerprint model. Images used to create your child’s fingerprint model are never stored, but the fingerprint model is stored securely on the device and never leaves the device. All processing occurs securely on the device."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="default" msgid="3948305045484131665">"You can delete your fingerprint images and model, or turn off Fingerprint Unlock at any time in settings. Fingerprint images and models are stored on the phone until you delete them."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="default" msgid="3948305045484131665">"You can delete your fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the phone until you delete them."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="tablet" msgid="1577753788807120092">"You can delete your fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the tablet until you delete them."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="device" msgid="5092396314447369758">"You can delete your fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the device until you delete them."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="default" msgid="4983770600405797515">"You and your child can delete their fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the phone until they’re deleted."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="tablet" msgid="8752022694697150943">"You and your child can delete their fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the tablet until they’re deleted."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="device" msgid="7234973062059196893">"You and your child can delete their fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the device until they’re deleted."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="2018885671994058605">"Your phone can be unlocked when you don’t intend it to be; for example, if someone holds it up to your finger."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="7390208617531513381">"Your tablet can be unlocked when you don’t intend it to be; for example, if someone holds it up to your finger."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="2018885671994058605">"Your phone can be unlocked when you don’t intend to, like if someone holds it up to your finger."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="7390208617531513381">"Your tablet can be unlocked when you don’t intend to, like if someone holds it up to your finger."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="device" msgid="1662571028234764290">"Your device can be unlocked when you don’t intend to, like if someone holds it up to your finger."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="8356551505082794682">"Your child’s phone can be unlocked when they don’t intend it to be; for example, if someone holds it up to their finger."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="8356551505082794682">"Your child’s phone can be unlocked when they don’t intend to, like if someone holds it up to their finger."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="6956407873271178462">"Your child’s tablet can be unlocked when they don’t intend to, like if someone holds it up to their finger."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="885555477843366483">"Your child’s device can be unlocked when they don’t intend to, like if someone holds it up to their finger."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"For best results, use a screen protector that’s Made For Google certified. With other screen protectors, your fingerprint may not work."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"For best results, use a screen protector that’s Made For Google certified. With other screen protectors, your child’s fingerprint may not work."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"For best results, use a screen protector that’s Made for Google certified. With other screen protectors, your fingerprint may not work."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"For best results, use a screen protector that’s Made for Google certified. With other screen protectors, your child’s fingerprint may not work."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_try_adjusting" msgid="3855444121278320304">"Change the position of your finger slightly each time"</string>
-    <string name="security_settings_fingerprint_v2_enroll_acquire_partially_detected" msgid="8330287007361798356">"Cover the icon with the centre of your fingerprint"</string>
+    <string name="security_settings_fingerprint_v2_enroll_acquire_partially_detected" msgid="8330287007361798356">"Cover the icon with the center of your fingerprint"</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_already_enrolled" msgid="8616678833080422946">"This fingerprint has already been added"</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_clean_sensor" msgid="3501453094314993113">"Clean your screen near the sensor and try again"</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_too_fast" msgid="5891227328100822018">"Lift your finger after you feel a vibration"</string>
     <string name="security_settings_fingerprint_v2_enroll_acquire_too_bright" msgid="769646735950329315">"Move somewhere with gentler lighting and try again"</string>
     <string name="security_settings_fingerprint_v2_enroll_error_max_attempts" msgid="1464972470750764128">"You’ve reached the maximum number of attempts"</string>
-    <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="179325591887291180">"Use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="2503218139575057099">"Use your fingerprint to unlock your device or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="481286891358925579">"Use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face and Fingerprint Unlock"</string>
+    <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="179325591887291180">"Use your fingerprint to unlock your tablet or verify it’s you, like when you sign in to apps"</string>
+    <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="2503218139575057099">"Use your fingerprint to unlock your device or verify it’s you, like when you sign in to apps"</string>
+    <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="481286891358925579">"Use your fingerprint to unlock your phone or verify it’s you, like when you sign in to apps"</string>
+    <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face &amp; Fingerprint Unlock"</string>
     <string name="security_settings_biometric_preference_summary_none_enrolled" msgid="6941188982863819389">"Tap to set up"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Face and fingerprints added"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"Face and fingerprint added"</string>
     <string name="biometric_settings_intro" msgid="4263069383955676756">"When you set up Face Unlock and Fingerprint Unlock, your phone will ask for your fingerprint when you wear a mask or are in a dark area"</string>
     <string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"Ways to unlock"</string>
     <string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"Unlock your phone"</string>
-    <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Verify that it’s you in apps"</string>
+    <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Verify it’s you in apps"</string>
     <string name="biometric_settings_use_face_preference_summary" msgid="1821648836899408477">"Using face"</string>
     <string name="biometric_settings_use_fingerprint_preference_summary" msgid="6077762097826050165">"Using fingerprint"</string>
     <string name="biometric_settings_use_face_or_fingerprint_preference_summary" msgid="3029102492674234728">"Using face or fingerprint"</string>
@@ -569,32 +569,31 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Keep your fingerprint flat on the sensor until you feel a vibration"</string>
     <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"Without pressing the button, keep your fingerprint on the sensor until you feel a vibration.\n\nMove your finger slightly each time. This helps capture more of your fingerprint."</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch and hold the fingerprint sensor"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Touch &amp; hold the fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"One more time"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Follow the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
-    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Touch and hold each time the fingerprint icon moves. This helps capture more of your fingerprint."</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint."</string>
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Place the tip of your finger on the sensor"</string>
     <string name="security_settings_udfps_enroll_left_edge_title" msgid="1944076382202470458">"Place the left edge of your finger"</string>
     <string name="security_settings_udfps_enroll_right_edge_title" msgid="9036744264606447490">"Place the right edge of your finger"</string>
-    <string name="security_settings_sfps_enroll_finger_center_title" msgid="1320688855767675739">"Place the centre part of your finger on the sensor"</string>
+    <string name="security_settings_sfps_enroll_finger_center_title" msgid="1320688855767675739">"Place the center part of your finger on the sensor"</string>
     <string name="security_settings_sfps_enroll_fingertip_title" msgid="2737520837684516446">"Place the tip of your finger on the sensor"</string>
     <string name="security_settings_sfps_enroll_left_edge_title" msgid="9022963735924413343">"Place the left edge of your finger on the sensor"</string>
     <string name="security_settings_sfps_enroll_right_edge_title" msgid="823106857743394392">"Finally, place the right edge of your finger on the sensor"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Place the side of your fingerprint on the sensor and hold, then switch to the other side"</string>
     <string name="security_settings_udfps_enroll_repeat_a11y_message" msgid="2785464357615568197">"This helps capture more of your fingerprint"</string>
-    <string name="security_settings_sfps_enroll_progress_a11y_message" msgid="6450772721691523736">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
-    <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Enrolled <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
-    <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
+    <string name="security_settings_sfps_enroll_progress_a11y_message" msgid="6450772721691523736">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> percent"</string>
+    <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Enrolled <xliff:g id="PERCENTAGE">%d</xliff:g> percent"</string>
+    <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> percent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps or approve a purchase"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Now you can use your fingerprint to unlock your device or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="6064618417107305796">"Now you can use your fingerprint to unlock your tablet or verify it’s you, like when you sign in to apps or approve a purchase"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="1948980056333872057">"Now you can use your fingerprint to unlock your device or verify it’s you, like when you sign in to apps or approve a purchase"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="3084541878035403475">"Now you can use your fingerprint to unlock your phone or verify it’s you, like when you sign in to apps or approve a purchase"</string>
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Unlock only when screen is on"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"The screen must be on before you can unlock with your fingerprint. This makes accidental unlocking less likely."</string>
-    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Screen, unlock"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Screen, Unlock"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Do it later"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Lift, then touch again"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Place the side of your fingerprint on the sensor and hold, then switch to the other side"</string>
@@ -639,35 +638,35 @@
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Skip PIN setup?"</string>
     <string name="lock_screen_pin_skip_face_title" msgid="8810770395309512358">"Skip setup for PIN and face?"</string>
     <string name="lock_screen_pin_skip_fingerprint_title" msgid="371214283158750976">"Skip setup for PIN and fingerprint?"</string>
-    <string name="lock_screen_pin_skip_biometrics_title" msgid="1082066572914073311">"Skip setup for PIN, face and fingerprint?"</string>
+    <string name="lock_screen_pin_skip_biometrics_title" msgid="1082066572914073311">"Skip setup for PIN, face, and fingerprint?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Skip password setup?"</string>
     <string name="lock_screen_password_skip_face_title" msgid="8166210519462164998">"Skip setup for password and face?"</string>
     <string name="lock_screen_password_skip_fingerprint_title" msgid="2506392546016772170">"Skip setup for password and fingerprint?"</string>
-    <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Skip setup for password, face and fingerprint?"</string>
+    <string name="lock_screen_password_skip_biometrics_title" msgid="900281322095862009">"Skip setup for password, face, and fingerprint?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Skip pattern setup?"</string>
     <string name="lock_screen_pattern_skip_face_title" msgid="145100333454316334">"Skip setup for pattern and face?"</string>
     <string name="lock_screen_pattern_skip_fingerprint_title" msgid="2513110208722100495">"Skip setup for pattern and fingerprint?"</string>
-    <string name="lock_screen_pattern_skip_biometrics_title" msgid="2434258106825380187">"Skip setup for pattern, face and fingerprint?"</string>
+    <string name="lock_screen_pattern_skip_biometrics_title" msgid="2434258106825380187">"Skip setup for pattern, face, and fingerprint?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="3538784524778508018">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="9198775984215057337">"Done"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="5742429501012827526">"Whoops, that\'s not the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="5742429501012827526">"Whoops, that’s not the sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="7172969336386036998">"Touch the sensor on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="8582267776559099046">"Fingerprint setup timed out"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="467965101751652156">"Try again now or set up your fingerprint later in Settings"</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"Fingerprint enrollment didn\'t work. Try again or use a different finger."</string>
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Add another"</string>
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Next"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"In addition to unlocking your phone, you can also use your fingerprint to authorize purchases and app access. "<annotation id="url">"Learn more"</annotation></string>
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"The screen lock option is disabled. To learn more, contact your organization’s admin."</string>
-    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"You can still use your fingerprint to authorise purchases and app access."</string>
+    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"You can still use your fingerprint to authorize purchases and app access."</string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Lift finger, then touch sensor again"</string>
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"Can’t use fingerprint sensor. Visit a repair provider"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"More security settings"</string>
-    <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Work profile lock, encryption and more"</string>
-    <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encryption, credentials and more"</string>
+    <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"Work profile lock, encryption, and more"</string>
+    <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Encryption, credentials, and more"</string>
     <string name="security_advanced_settings_keywords" msgid="5294945170370974974">"security, more security settings, more settings, advanced security settings"</string>
     <string name="privacy_advanced_settings" msgid="8828215456566937719">"More privacy settings"</string>
-    <string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"Auto-fill, Activity controls and more"</string>
+    <string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"Autofill, activity controls, and more"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"You’ve added the maximum number of fingerprints"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Can’t add more fingerprints"</string>
@@ -677,17 +676,17 @@
     <string name="fingerprint_v2_delete_message" product="default" msgid="8310023888801801048">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your phone"</string>
     <string name="fingerprint_v2_delete_message" product="tablet" msgid="114315319294083658">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your tablet"</string>
     <string name="fingerprint_v2_delete_message" product="device" msgid="4136720729608391131">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your device"</string>
-    <string name="fingerprint_last_delete_message" product="default" msgid="7860374760549404410">"You won\'t be able to use your fingerprint to unlock your phone or verify that it\'s you in apps."</string>
-    <string name="fingerprint_last_delete_message" product="tablet" msgid="4067899967580007895">"You won\'t be able to use your fingerprint to unlock your tablet or verify that it\'s you in apps."</string>
-    <string name="fingerprint_last_delete_message" product="device" msgid="8582976866145366358">"You won\'t be able to use your fingerprint to unlock your device or verify that it\'s you in apps."</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"You won\'t be able to use your fingerprint to unlock your work profile, authorise purchases or sign in to work apps."</string>
+    <string name="fingerprint_last_delete_message" product="default" msgid="7860374760549404410">"You won\'t be able to use your fingerprint to unlock your phone or verify it\'s you in apps."</string>
+    <string name="fingerprint_last_delete_message" product="tablet" msgid="4067899967580007895">"You won\'t be able to use your fingerprint to unlock your tablet or verify it\'s you in apps."</string>
+    <string name="fingerprint_last_delete_message" product="device" msgid="8582976866145366358">"You won\'t be able to use your fingerprint to unlock your device or verify it\'s you in apps."</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"You won\'t be able to use your fingerprint to unlock your work profile, authorize purchases, or sign in to work apps."</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Yes, remove"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Encryption"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Encrypt tablet"</string>
     <string name="encrypt_title" product="default" msgid="7337365190988321100">"Encrypt phone"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Encrypted"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Set a screen lock"</string>
-    <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"For added security, set a PIN, pattern or password for this device."</string>
+    <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"For added security, set a PIN, pattern, or password for this device."</string>
     <string name="no_screen_lock_issue_action_label" msgid="2691229130486382863">"Set screen lock"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Secure your phone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Set screen lock to protect tablet"</string>
@@ -706,9 +705,9 @@
     <string name="setup_lock_settings_picker_title" product="device" msgid="3585905639045649905">"Protect your device"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="2758197863515864300">"Protect your phone"</string>
     <string name="lock_settings_picker_biometrics_added_security_message" msgid="1105247657304421299">"For added security, set a backup screen lock"</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock you want to use."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock you want to use."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock you want to use."</string>
     <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choose your backup screen lock method"</string>
     <string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"If you forget your screen lock, your IT admin can’t reset it."</string>
     <string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"Set a separate work lock"</string>
@@ -716,11 +715,11 @@
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Screen lock options"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
-    <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5799070517574360310">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> /Immediately after sleep"</string>
+    <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5799070517574360310">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Immediately after sleep"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4572132216801894216">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> after sleep"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7631371082326055429">"Work profile lock"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="4746783679112447948">"Change lock screen"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"Change or disable pattern, PIN or password security"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"Change or disable pattern, PIN, or password security"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="1699993191343299179">"Choose a method to lock the screen"</string>
     <string name="unlock_set_unlock_off_title" msgid="2831957685685921667">"None"</string>
     <string name="unlock_set_unlock_off_summary" msgid="4578319976164001322"></string>
@@ -739,9 +738,9 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerprint + Password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continue without fingerprint"</string>
     <string name="fingerprint_unlock_title" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
-    <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Face Unlock + pattern"</string>
+    <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Face Unlock + Pattern"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Face Unlock + PIN"</string>
-    <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Face Unlock + password"</string>
+    <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Face Unlock + Password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continue without Face Unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pattern • Face • Fingerprint"</string>
@@ -749,13 +748,13 @@
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Face • Fingerprint"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continue without face or fingerprint"</string>
     <string name="biometrics_unlock_title" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy, or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"Pattern"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="9028659554829888373">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="8810609692771987513">"Password"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"Once you\'ve set up a screen lock, you can also set up your fingerprint in Settings &gt; Security."</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"Once you’ve set up a screen lock, you can also set up your fingerprint in Settings &gt; Security."</string>
     <string name="unlock_disable_lock_title" msgid="2564279819907932759">"Turn off screen lock"</string>
     <string name="unlock_disable_frp_warning_title" msgid="3606280046362811229">"Delete screen lock?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="1005284289723910461">"Remove profile protection?"</string>
@@ -805,7 +804,7 @@
     <string name="unlock_change_lock_password_title" msgid="873517913969091074">"Change unlock password"</string>
     <string name="unlock_footer_high_complexity_requested" msgid="4471274783909915352">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommends a strong PIN or password and may not work as expected without one"</string>
     <string name="unlock_footer_medium_complexity_requested" msgid="5515870066751600640">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommends a new PIN or password and may not work as expected without one"</string>
-    <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommends a new pattern, PIN or password and may not work as expected without one"</string>
+    <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommends a new pattern, PIN, or password and may not work as expected without one"</string>
     <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommends a new screen lock"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"Your data will be deleted"</string>
@@ -866,18 +865,18 @@
       <item quantity="one">Must contain at least 1 non-letter character</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
-      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-numeric characters</item>
-      <item quantity="one">Must contain at least 1 non-numeric character</item>
+      <item quantity="other">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-numerical characters</item>
+      <item quantity="one">Must contain at least 1 non-numerical character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending, or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
     <string name="lockpassword_clear_label" msgid="311359833434539894">"Clear"</string>
     <string name="lockpassword_credential_changed" msgid="5934778179732392028">"Screen lock was already changed. Try again with the new screen lock."</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="775215267818384016">"Cancel"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="1329049481210689408">"Next"</string>
-    <string name="lock_setup" msgid="4622999020926280737">"Set up is complete."</string>
+    <string name="lock_setup" msgid="4622999020926280737">"Setup is complete."</string>
     <string name="manage_device_admin" msgid="1044620606203916275">"Device admin apps"</string>
     <string name="number_of_device_admins_none" msgid="152926922020437312">"No active apps"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
@@ -904,13 +903,13 @@
     <string name="bluetooth_pin_values_hint_16_digits" msgid="5603928271430883558">"Must be 16 digits"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
     <string name="bluetooth_error_title" msgid="2284738188253690278"></string>
-    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Couldn\'t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Couldn’t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"Scan for devices"</string>
     <string name="bluetooth_search_for_devices" msgid="6516902340975407648">"Refresh"</string>
     <string name="bluetooth_searching_for_devices" msgid="6541984133657573124">"Searching…"</string>
@@ -942,7 +941,7 @@
     <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
-    <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
+    <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect App?"</string>
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="4730377171981539265">"Your phone will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="3428463407231980054">"Your tablet will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="5117397433721336918">"Your device will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -951,19 +950,19 @@
     <string name="bluetooth_companion_app_remove_association_confirm_button" msgid="76323555527926915">"Disconnect app"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="1323072239637864488">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from handsfree audio."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="4794752406024916925">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from input device."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"Internet access via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this tablet’s Internet connection."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="7852265676243153982">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this phone’s Internet connection."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this tablet’s internet connection."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="7852265676243153982">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this phone’s internet connection."</string>
     <string name="bluetooth_device_advanced_title" msgid="1181664272013729515">"Paired Bluetooth device"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="8302236592496988747">"Connect"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="271856759516576615">"Connect to Bluetooth device"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="7892879890208207223">"Use for"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="4798081898389041132">"Rename"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="7604726126703453984">"Allow incoming file transfers"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="7851033200857999275">"Connected to device for Internet access"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="5563892893331988809">"Sharing local Internet connection with device"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="7851033200857999275">"Connected to device for internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="5563892893331988809">"Sharing local internet connection with device"</string>
     <string name="bluetooth_dock_settings" msgid="1709536202189755022">"Dock Settings"</string>
     <string name="bluetooth_dock_settings_title" msgid="4872789068019972847">"Use dock for audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="5756482379574272554">"As speaker phone"</string>
@@ -1007,7 +1006,7 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"Allow data exchange when the tablet touches an NFC device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"Allow data exchange when the phone touches an NFC device"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"Turn on NFC"</string>
-    <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers and interactive ads or tags."</string>
+    <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers, and interactive ads or tags."</string>
     <string name="nfc_secure_settings_title" msgid="4906958426927741485">"Require device unlock for NFC"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="407654335737959071">"Allow NFC use only when screen is unlocked"</string>
     <string name="android_beam_settings_title" msgid="2797963824490671295">"Android Beam"</string>
@@ -1015,7 +1014,7 @@
     <string name="android_beam_off_summary" msgid="5693961375631325042">"Off"</string>
     <string name="nfc_disabled_summary" msgid="8737797364522502351">"Unavailable because NFC is turned off"</string>
     <string name="android_beam_label" msgid="7168565080321110094">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="5684416131846701256">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed."</string>
+    <string name="android_beam_explained" msgid="5684416131846701256">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts, and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed."</string>
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
@@ -1037,8 +1036,8 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"Unavailable because Wi‑Fi scanning is turned off"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"To use, select a network rating provider"</string>
     <string name="wifi_poor_network_detection" msgid="8210035875160288422">"Avoid poor connections"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Don’t use a Wi‑Fi network unless it has a good Internet connection"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Only use networks that have a good Internet connection"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"Don’t use a Wi‑Fi network unless it has a good internet connection"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"Only use networks that have a good internet connection"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"Connect to public networks"</string>
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Automatically connect to high‑quality public networks"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"To use, select a network rating provider"</string>
@@ -1046,17 +1045,17 @@
     <string name="wifi_install_credentials" msgid="5192903644606839972">"Install certificates"</string>
     <string name="wifi_scan_notify_text" msgid="7163137260385995873">"To improve location accuracy, apps and services can still scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Wi‑Fi scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"To improve location accuracy, turn on Wi-Fi scanning in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Wi‑Fi scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Don\'t show again"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Don’t show again"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Keep Wi‑Fi on during sleep"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi‑Fi on during sleep"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"There was a problem while changing the setting"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"There was a problem changing the setting"</string>
     <string name="wifi_suspend_efficiency_title" msgid="3589291227092825754">"Improve efficiency"</string>
-    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Wi‑Fi optimisation"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Minimise battery usage when Wi‑Fi is on"</string>
+    <string name="wifi_suspend_optimizations" msgid="5840680940416640209">"Wi‑Fi optimization"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="8204170804523356781">"Minimize battery usage when Wi‑Fi is on"</string>
     <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Limit battery used by Wi‑Fi"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Switch to mobile data if Wi‑Fi loses Internet access."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Switch to mobile data if Wi‑Fi loses internet access."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Switch to mobile data automatically"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Use mobile data when Wi‑Fi has no Internet access. Data usage charges may apply."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Use mobile data when Wi‑Fi has no internet access. Data usage charges may apply."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Add network"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Wi‑Fi preferences"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi turns back on automatically"</string>
@@ -1073,7 +1072,7 @@
     <string name="wifi_menu_modify" msgid="7246143391161038875">"Modify network"</string>
     <string name="wifi_empty_list_wifi_off" msgid="7697422506708419298">"To see available networks, turn Wi‑Fi on."</string>
     <string name="wifi_empty_list_wifi_on" msgid="2448010040478321376">"Searching for networks…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"You don\'t have permission to change the Wi‑Fi network."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"You don’t have permission to change the Wi‑Fi network."</string>
     <string name="wifi_more" msgid="8742256421693351035">"More"</string>
     <string name="wifi_setup_wps" msgid="4303694722593999931">"Automatic setup (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Turn on Wi‑Fi scanning?"</string>
@@ -1082,7 +1081,7 @@
     <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Turn on"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"Wi‑Fi scanning turned on"</string>
     <string name="wifi_show_advanced" msgid="2969378109942071741">"Advanced options"</string>
-    <string name="wifi_advanced_toggle_description" msgid="7299179796727934885">"Drop-down list Advanced Options"</string>
+    <string name="wifi_advanced_toggle_description" msgid="7299179796727934885">"Drop down list Advanced Options"</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="3615140699129928913">"expand"</string>
     <string name="wifi_ssid" msgid="2713062130735103151">"Network name"</string>
     <string name="wifi_ssid_hint" msgid="1940577553241083524">"Enter the SSID"</string>
@@ -1101,18 +1100,18 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP method"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Phase 2 authentication"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA certificate"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Online certificate status"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Online Certificate Status"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Domain"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"User certificate"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identity"</string>
     <string name="wifi_eap_anonymous" msgid="8630332141751267000">"Anonymous identity"</string>
     <string name="wifi_password" msgid="1458802324849513755">"Password"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"Show password"</string>
-    <string name="wifi_ap_band_config" msgid="1589020070150933055">"Select AP band"</string>
+    <string name="wifi_ap_band_config" msgid="1589020070150933055">"Select AP Band"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Auto"</string>
-    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 GHz band"</string>
-    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 GHz band"</string>
-    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 GHz band preferred"</string>
+    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 GHz Band"</string>
+    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 GHz Band"</string>
+    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 GHz Band preferred"</string>
     <string name="wifi_ap_2G" msgid="4099628221864343015">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="3493942667238551207">"5.0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Choose at least one band for Wi‑Fi hotspot:"</string>
@@ -1120,27 +1119,27 @@
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"Privacy"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"Subscription"</string>
     <string name="wifi_subscription_summary" msgid="18802471063384598">"View or change subscription"</string>
-    <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"Randomised MAC"</string>
+    <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"Randomized MAC"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="6141246783457722976">"Add a device"</string>
-    <string name="wifi_dpp_center_qr_code" msgid="5270782275746178104">"Centre the QR code below to add the device to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
+    <string name="wifi_dpp_center_qr_code" msgid="5270782275746178104">"Center the QR code below to add the device to “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"Scan QR code"</string>
-    <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
+    <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Center the QR code below to connect to “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
-    <string name="wifi_dpp_failure_timeout" msgid="7902971341771145564">"Make sure that the device has been plugged in, charged and turned on"</string>
-    <string name="wifi_dpp_failure_generic" msgid="6559442892600448442">"Make sure that the device has been plugged in, charged and turned on. If the issue continues, contact the device manufacturer"</string>
-    <string name="wifi_dpp_failure_not_supported" msgid="2908961523550486480">"Adding \'<xliff:g id="SSID">%1$s</xliff:g>\' isn’t supported by this device"</string>
+    <string name="wifi_dpp_failure_timeout" msgid="7902971341771145564">"Make sure the device has been plugged in, charged, and turned on"</string>
+    <string name="wifi_dpp_failure_generic" msgid="6559442892600448442">"Make sure the device has been plugged in, charged, and turned on. If the issue continues, contact the device manufacturer"</string>
+    <string name="wifi_dpp_failure_not_supported" msgid="2908961523550486480">"Adding “<xliff:g id="SSID">%1$s</xliff:g>” isn’t supported by this device"</string>
     <string name="wifi_dpp_failure_cannot_find_network" msgid="8519567801353014036">"Try moving the device closer to your Wi‑Fi access point/router"</string>
     <string name="wifi_dpp_failure_enrollee_authentication" msgid="7008840843663520852">"Check the password and try again"</string>
     <string name="wifi_dpp_failure_enrollee_rejected_configuration" msgid="982310033782652478">"Contact the device manufacturer"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="6118892932595974823">"Check connection and try again"</string>
     <string name="wifi_dpp_choose_network" msgid="3987007684129341427">"Choose network"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="4321618376432197593">"To connect your device, choose a network"</string>
-    <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Add this device to \'<xliff:g id="SSID">%1$s</xliff:g>\'?"</string>
+    <string name="wifi_dpp_add_device_to_wifi" msgid="5170095438763569255">"Add this device to “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
     <string name="wifi_dpp_wifi_shared_with_device" msgid="4484366631307204949">"Wi‑Fi shared with device"</string>
     <string name="wifi_dpp_add_another_device" msgid="3307575293580739604">"Add another device"</string>
     <string name="wifi_dpp_choose_different_network" msgid="8963625819804792157">"Choose different network"</string>
@@ -1165,7 +1164,7 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_trust_on_first_use" msgid="7488431582505858774">"Trust on first use"</string>
+    <string name="wifi_trust_on_first_use" msgid="7488431582505858774">"Trust on First Use"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -1181,10 +1180,10 @@
     <string name="wifi_hotspot_title" msgid="1918712370697971229">"Sign in to connect?"</string>
     <string name="wifi_hotspot_message" msgid="5245614124614833169">"<xliff:g id="APP_NAME">%1$s</xliff:g> requires you to sign in online before you connect to the network."</string>
     <string name="wifi_hotspot_connect" msgid="1916314048788438331">"CONNECT"</string>
-    <string name="no_internet_access_text" msgid="3611993143350310936">"This network has no Internet access. Stay connected?"</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"This network has no internet access. Stay connected?"</string>
     <string name="partial_connectivity_text" msgid="8874614799723694554">"Some apps and services may not work due to limited connectivity. Use anyway?"</string>
-    <string name="no_internet_access_remember" msgid="5113610157731269258">"Don\'t ask again for this network"</string>
-    <string name="lost_internet_access_title" msgid="9032463989950384698">"Wi‑Fi is not connected to the Internet"</string>
+    <string name="no_internet_access_remember" msgid="5113610157731269258">"Don’t ask again for this network"</string>
+    <string name="lost_internet_access_title" msgid="9032463989950384698">"Wi‑Fi is not connected to the internet"</string>
     <string name="lost_internet_access_text" msgid="1535911323549496789">"You can switch to the mobile network whenever Wi‑Fi has a bad connection. Data usage charges may apply."</string>
     <string name="lost_internet_access_switch" msgid="7935665847081706202">"Switch to mobile"</string>
     <string name="lost_internet_access_cancel" msgid="1981171269794585284">"Stay on Wi‑Fi"</string>
@@ -1219,8 +1218,8 @@
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Advanced Wi‑Fi"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
-    <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
-    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomised MAC address (last used)"</string>
+    <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomized MAC address"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomized MAC address (last used)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1234,12 +1233,12 @@
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi advanced settings are not available for this user"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Save"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="1757817733064004598">"Cancel"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="3622891107865052307">"Please type a valid IP address."</string>
-    <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="3622891107865052307">"Type a valid IP address."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
-    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by Private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by Private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1250,26 +1249,26 @@
     <string name="wifi_p2p_menu_rename" msgid="7059994112737743336">"Rename device"</string>
     <string name="wifi_p2p_peer_devices" msgid="5158559154640283546">"Peer devices"</string>
     <string name="wifi_p2p_remembered_groups" msgid="5497007770930525695">"Remembered groups"</string>
-    <string name="wifi_p2p_failed_connect_message" msgid="6767831720507440027">"Could not connect."</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="6767831720507440027">"Couldn’t connect."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="1317434386267376606">"Failed to rename device."</string>
     <string name="wifi_p2p_disconnect_title" msgid="96361896458072463">"Disconnect?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="1208761239498807208">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> will end."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="4490648217799144078">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> and <xliff:g id="PEER_COUNT">%2$s</xliff:g> other devices will end."</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="8476985132989357041">"Cancel invitation"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="8476985132989357041">"Cancel invitation?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="2409074184473879809">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="4880242270742385699">"Forget this group?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Not sharing Internet or content with other devices"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Sharing this tablet’s Internet connection via hotspot"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Sharing this phone’s Internet connection via hotspot"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Not sharing internet or content with other devices"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Sharing this tablet’s internet connection via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Sharing this phone’s internet connection via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides internet using your mobile data connection. Additional mobile data charges may apply."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Apps can create a hotspot to share content with nearby devices."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Turn off hotspot automatically"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"When no devices are connected"</string>
@@ -1285,7 +1284,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7072559431286459122">"Set up Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="9027072969831022321">"Wi‑Fi hotspot setup"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="1445157424926935178">"AndroidAP WPA2 PSK hotspot"</string>
-    <string name="wifi_tether_configure_ssid_default" msgid="1709397571393179300">"Android Hotspot"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="1709397571393179300">"AndroidHotspot"</string>
     <string name="wifi_add_app_single_network_title" msgid="8911612806204065225">"Save this network?"</string>
     <string name="wifi_add_app_single_network_summary" product="default" msgid="6881712878537666626">"<xliff:g id="APPNAME">%1$s</xliff:g> wants to save a network to your phone"</string>
     <string name="wifi_add_app_single_network_summary" product="tablet" msgid="8455616967601552440">"<xliff:g id="APPNAME">%1$s</xliff:g> wants to save a network to your tablet"</string>
@@ -1297,7 +1296,7 @@
     <string name="wifi_add_app_networks_summary" product="tablet" msgid="2088967184512169910">"<xliff:g id="APPNAME">%1$s</xliff:g> wants to save these networks to your tablet"</string>
     <string name="wifi_add_app_networks_saving_summary" msgid="577680250954742033">"Saving <xliff:g id="NUMBER">%d</xliff:g> networks…"</string>
     <string name="wifi_add_app_networks_saved_summary" msgid="1648417628665152905">"Networks saved"</string>
-    <string name="wifi_calling_settings_title" msgid="264665264535884440">"Wi-Fi Calling"</string>
+    <string name="wifi_calling_settings_title" msgid="264665264535884440">"Wi-Fi calling"</string>
     <string name="wifi_calling_suggestion_title" msgid="4791435106729906727">"Extend calls with Wi‑Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="5413024679599742858">"Turn on Wi‑Fi calling to extend coverage"</string>
     <string name="wifi_calling_mode_title" msgid="5145896168360825619">"Calling preference"</string>
@@ -1331,10 +1330,10 @@
     <string name="wifi_disconnected_from" msgid="5249576734324159708">"Disconnected from <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="carrier" msgid="1755020806290963951">"Carrier"</string>
     <string name="display_settings_title" msgid="626835071804834218">"Display"</string>
-    <string name="sound_settings" msgid="7622986039384531304">"Sound and vibration"</string>
+    <string name="sound_settings" msgid="7622986039384531304">"Sound &amp; vibration"</string>
     <string name="all_volume_title" msgid="6196367642878437513">"Volumes"</string>
     <string name="musicfx_title" msgid="5458574743312283473">"Music effects"</string>
-    <string name="ring_volume_title" msgid="4869034595079914541">"Ring and notification volume"</string>
+    <string name="ring_volume_title" msgid="4869034595079914541">"Ring &amp; notification volume"</string>
     <string name="vibrate_in_silent_title" msgid="5076579100685867363">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="8747567935870133157">"Default notification sound"</string>
     <string name="incoming_call_volume_title" msgid="8445408274513654261">"Ringtone"</string>
@@ -1346,11 +1345,11 @@
     <string name="media_volume_summary" msgid="4671324482655564873">"Set volume for music and videos"</string>
     <string name="alarm_volume_title" msgid="706302621191735343">"Alarm"</string>
     <string name="dock_settings_summary" msgid="8548721822219932359">"Audio settings for the attached dock"</string>
-    <string name="dtmf_tone_enable_title" msgid="2241337296249130217">"Dial-pad touch tones"</string>
+    <string name="dtmf_tone_enable_title" msgid="2241337296249130217">"Dial pad touch tones"</string>
     <string name="sound_effects_enable_title" msgid="328569690466233866">"Tap sounds"</string>
-    <string name="lock_sounds_enable_title" msgid="804365014499259673">"Screen lock sounds"</string>
+    <string name="lock_sounds_enable_title" msgid="804365014499259673">"Screen lock sound"</string>
     <string name="audio_record_proc_title" msgid="486071779724181619">"Noise cancellation"</string>
-    <string name="volume_media_description" msgid="2736061076584067204">"Music, video, games &amp; other media"</string>
+    <string name="volume_media_description" msgid="2736061076584067204">"Music, video, games, &amp; other media"</string>
     <string name="volume_ring_description" msgid="5423168446359881864">"Ringtone &amp; notifications"</string>
     <string name="volume_notification_description" msgid="3241009629930030492">"Notifications"</string>
     <string name="volume_alarm_description" msgid="156563371961039376">"Alarms"</string>
@@ -1369,11 +1368,11 @@
     <string name="dock_not_found_title" msgid="4721157149003423417">"Dock not found"</string>
     <string name="dock_not_found_text" product="tablet" msgid="9192097687086523411">"You need to dock the tablet before setting up dock audio."</string>
     <string name="dock_not_found_text" product="default" msgid="2247163115146852069">"You need to dock the phone before setting up dock audio."</string>
-    <string name="dock_sounds_enable_title" msgid="2974614136344237932">"Dock insertion sound"</string>
+    <string name="dock_sounds_enable_title" msgid="2974614136344237932">"Dock insert sound"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="468592489565539336">"Play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8121670617316301768">"Play sound when inserting or removing phone from dock"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="7833926726878567889">"Don\'t play sound when inserting or removing tablet from dock"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="5560601997128422001">"Don\'t play sound when inserting or removing phone from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="7833926726878567889">"Don’t play sound when inserting or removing tablet from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="5560601997128422001">"Don’t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="255404935489127404">"Accounts"</string>
     <string name="accessibility_category_work" msgid="5133894487353964944">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="2228088849803484780">"Personal profile accounts"</string>
@@ -1384,8 +1383,8 @@
     <string name="accelerometer_title" msgid="7745991950833748909">"Auto-rotate screen"</string>
     <string name="auto_rotate_option_off" msgid="2788096269396290731">"Off"</string>
     <string name="auto_rotate_option_on" msgid="5776678230808498171">"On"</string>
-    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"On – Face-based"</string>
-    <string name="auto_rotate_switch_face_based" msgid="9116123744601564320">"Face detection"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"On - Face-based"</string>
+    <string name="auto_rotate_switch_face_based" msgid="9116123744601564320">"Face Detection"</string>
     <string name="auto_rotate_screen_summary" product="default" msgid="4547268203621754096">"Automatically adjust the screen orientation when you move your phone between portrait and landscape"</string>
     <string name="auto_rotate_screen_summary" product="tablet" msgid="2148040599220623607">"Automatically adjust the screen orientation when you move your tablet between portrait and landscape"</string>
     <string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Learn more about auto-rotate"</string>
@@ -1397,13 +1396,13 @@
     <string name="screen_resolution_summary_highest" msgid="2609112310453953756">"1440p QHD+"</string>
     <string name="screen_resolution_footer" msgid="6772341522952795647">"Full resolution uses more of your battery. Switching your resolution may cause some apps to restart."</string>
     <string name="screen_resolution_selected_a11y" msgid="6158451180032224977">"Selected"</string>
-    <string name="color_mode_title" msgid="8666690832113906028">"Colours"</string>
+    <string name="color_mode_title" msgid="8666690832113906028">"Colors"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Boosted"</string>
     <string name="color_mode_option_saturated" msgid="3413853820158447300">"Saturated"</string>
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptive"</string>
-    <string name="color_mode_summary_natural" msgid="8298840714001791628">"Use accurate colours only"</string>
-    <string name="color_mode_summary_automatic" msgid="8157885594041700275">"Adjust between vivid and accurate colours"</string>
+    <string name="color_mode_summary_natural" msgid="8298840714001791628">"Use accurate colors only"</string>
+    <string name="color_mode_summary_automatic" msgid="8157885594041700275">"Adjust between vivid and accurate colors"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"Switch orientation automatically when rotating tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"Switch orientation automatically when rotating phone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"Switch orientation automatically when rotating tablet"</string>
@@ -1429,28 +1428,28 @@
     <string name="auto_brightness_subtitle" msgid="6839449395639517870">"Your preferred brightness level"</string>
     <string name="auto_brightness_off_summary" msgid="4993150980274474226">"Don\'t adjust for available light"</string>
     <string name="auto_brightness_very_high_summary" msgid="2784981315548144255">"Increased battery usage"</string>
-    <string name="auto_brightness_disclaimer" msgid="1868395832774087351">"Optimise brightness level for available light. When this feature is on, you can still adjust brightness temporarily."</string>
+    <string name="auto_brightness_disclaimer" msgid="1868395832774087351">"Optimize brightness level for available light. When this feature is on, you can still adjust brightness temporarily."</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences."</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"Display white balance"</string>
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
-    <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
+    <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
     <string name="force_high_refresh_rate_toggle" msgid="3325789621928312050">"Force peak refresh rate"</string>
-    <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
+    <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness &amp; animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
-    <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
+    <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On / Screen won’t turn off if you’re looking at it"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Camera access needed"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5822591289468803691">"Camera access is required for screen attention. Tap to manage permissions for Device Personalisation Services"</string>
+    <string name="adaptive_sleep_summary_no_permission" msgid="5822591289468803691">"Camera access is required for screen attention. Tap to manage permissions for Device Personalization Services"</string>
     <string name="adaptive_sleep_manage_permission_button" msgid="1404510197847664846">"Manage permissions"</string>
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Prevents your screen from turning off if you’re looking at it"</string>
-    <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Screen attention uses the front camera to see if someone is looking at the screen. It works on-device, and images are never stored or sent to Google."</string>
+    <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Screen attention uses the front camera to see if someone is looking at the screen. It works on device, and images are never stored or sent to Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Turn on screen attention"</string>
     <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Keep screen on when looking at it"</string>
     <string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"Camera is locked"</string>
-    <string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"Camera must be unlocked for face detection"</string>
-    <string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"Camera must be unlocked for screen attention"</string>
-    <string name="auto_rotate_summary_no_permission" msgid="1025061139746254554">"Camera access is required for face detection. Tap to manage permissions for Device Personalisation Services"</string>
+    <string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"Camera must be unlocked for Face Detection"</string>
+    <string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"Camera must be unlocked for Screen Attention"</string>
+    <string name="auto_rotate_summary_no_permission" msgid="1025061139746254554">"Camera access is required for Face Detection. Tap to manage permissions for Device Personalization Services"</string>
     <string name="auto_rotate_manage_permission_button" msgid="2591146085906382385">"Manage permissions"</string>
     <string name="night_display_title" msgid="8532432776487216581">"Night Light"</string>
     <string name="night_display_text" msgid="4789324042428095383">"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>
@@ -1481,7 +1480,7 @@
     <string name="dark_ui_activation_off_manual" msgid="2395333709291250065">"Turn off now"</string>
     <string name="dark_ui_activation_on_auto" msgid="4824339634784765049">"Turn on until sunrise"</string>
     <string name="dark_ui_activation_off_auto" msgid="9136717444658505208">"Turn off until sunset"</string>
-    <string name="dark_ui_title" msgid="3373976268671557416">"Dark mode"</string>
+    <string name="dark_ui_title" msgid="3373976268671557416">"Dark Mode"</string>
     <string name="dark_ui_auto_mode_title" msgid="9027528859262295099">"Schedule"</string>
     <string name="dark_ui_auto_mode_never" msgid="3980412582267787662">"None"</string>
     <string name="dark_ui_auto_mode_auto" msgid="6658909029498623375">"Turns on from sunset to sunrise"</string>
@@ -1505,15 +1504,15 @@
     <string name="screen_timeout_title" msgid="785134393520893049">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="wallpaper_settings_title" msgid="5635129851136006383">"Wallpaper"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Wallpaper and style"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Wallpaper &amp; style"</string>
     <string name="wallpaper_dashboard_summary" msgid="2324472863981057118">"Home, lock screen"</string>
     <string name="wallpaper_settings_summary_default" msgid="7569803705735001813">"Default"</string>
     <string name="wallpaper_settings_summary_custom" msgid="3174561317688848729">"Custom"</string>
     <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Change wallpaper"</string>
-    <string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Personalise your screen"</string>
+    <string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Personalize your screen"</string>
     <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Choose wallpaper from"</string>
-    <string name="style_suggestion_title" msgid="1213747484782364775">"Customise your phone"</string>
-    <string name="style_suggestion_summary" msgid="4271131877800968159">"Try different styles, wallpapers and more"</string>
+    <string name="style_suggestion_title" msgid="1213747484782364775">"Customize your phone"</string>
+    <string name="style_suggestion_summary" msgid="4271131877800968159">"Try different styles, wallpapers, and more"</string>
     <string name="screensaver_settings_title" msgid="3588535639672365395">"Screen saver"</string>
     <string name="keywords_screensaver" msgid="7249337959432229172">"screensaver"</string>
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Unavailable because bedtime mode is on"</string>
@@ -1556,10 +1555,10 @@
     <string name="sim_reenter_new" msgid="6131418271490374263">"Re‑type new PIN"</string>
     <string name="sim_change_pin" msgid="1104103818545005448">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="5416328363761048221">"Incorrect PIN"</string>
-    <string name="sim_pins_dont_match" msgid="1540348773896609260">"PINs don\'t match"</string>
-    <string name="sim_change_failed" msgid="316723087029061740">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
+    <string name="sim_pins_dont_match" msgid="1540348773896609260">"PINs don’t match"</string>
+    <string name="sim_change_failed" msgid="316723087029061740">"Can’t change PIN.\nPossibly incorrect PIN."</string>
     <string name="sim_change_succeeded" msgid="3516905528149069739">"SIM PIN changed successfully"</string>
-    <string name="sim_lock_failed" msgid="16360418201678317">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
+    <string name="sim_lock_failed" msgid="16360418201678317">"Can’t change SIM card lock state.\nPossibly incorrect PIN."</string>
     <string name="sim_pin_disable_failed" msgid="8719890393181032837">"Can\'t disable PIN."</string>
     <string name="sim_pin_enable_failed" msgid="5156513975085380284">"Can\'t enable PIN."</string>
     <string name="sim_enter_ok" msgid="3401715290135787531">"OK"</string>
@@ -1570,7 +1569,7 @@
     <string name="sim_change_data_message" msgid="3046178883369645132">"You\'re using <xliff:g id="CARRIER2_0">%2$s</xliff:g> for mobile data. If you switch to <xliff:g id="CARRIER1">%1$s</xliff:g>, <xliff:g id="CARRIER2_1">%2$s</xliff:g> will no longer be used for mobile data."</string>
     <string name="sim_change_data_ok" msgid="4922114750417276560">"Use <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Update preferred SIM card?"</string>
-    <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls and SMS messages?"</string>
+    <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is the only SIM in your device. Do you want to use this SIM for mobile data, calls, and SMS messages?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Incorrect SIM PIN code you must now contact your carrier to unlock your device."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
@@ -1592,10 +1591,10 @@
     <string name="device_info_not_available" msgid="4804474466616712326">"Not available"</string>
     <string name="device_status_activity_title" msgid="1812666241137263882">"Status"</string>
     <string name="device_status" msgid="7988547478034984649">"Status"</string>
-    <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"Status of the battery, network and other information"</string>
+    <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"Status of the battery, network, and other information"</string>
     <string name="device_status_summary" product="default" msgid="8132661857066128832">"Phone number, signal, etc."</string>
     <string name="storage_settings" msgid="7472188817781592677">"Storage"</string>
-    <string name="storage_settings_for_app" msgid="229425418984637483">"Storage and cache"</string>
+    <string name="storage_settings_for_app" msgid="229425418984637483">"Storage &amp; cache"</string>
     <string name="storage_usb_settings" msgid="7058142934214211583">"Storage"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"Unmount USB storage, view available storage"</string>
@@ -1625,7 +1624,7 @@
     <string name="status_latest_area_info" msgid="8288488664620741734">"Operator info"</string>
     <string name="status_data_state" msgid="525196229491743487">"Mobile network state"</string>
     <string name="status_esim_id" msgid="5158916796362809133">"EID"</string>
-    <string name="status_service_state" msgid="1693424422121058791">"Service status"</string>
+    <string name="status_service_state" msgid="1693424422121058791">"Service state"</string>
     <string name="status_signal_strength" msgid="7644525712554444359">"Signal strength"</string>
     <string name="status_roaming" msgid="1253597174715663778">"Roaming"</string>
     <string name="status_operator" msgid="4335640583552058491">"Network"</string>
@@ -1633,7 +1632,7 @@
     <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"Device Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="6919660304578476547">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="9060064164331466789">"Serial number"</string>
-    <string name="status_up_time" msgid="1274778533719495438">"Uptime"</string>
+    <string name="status_up_time" msgid="1274778533719495438">"Up time"</string>
     <string name="status_awake_time" msgid="2573925324168081586">"Awake time"</string>
     <string name="internal_memory" msgid="1869518160077033848">"Internal storage"</string>
     <string name="sd_memory" product="nosdcard" msgid="5456718463397723781">"USB storage"</string>
@@ -1641,7 +1640,7 @@
     <string name="memory_available" msgid="712528795743654737">"Available"</string>
     <string name="memory_available_read_only" msgid="3201969221573511590">"Available (read-only)"</string>
     <string name="memory_size" msgid="2710897518522931469">"Total space"</string>
-    <string name="memory_calculating_size" msgid="3898240439798661242">"Calculating..."</string>
+    <string name="memory_calculating_size" msgid="3898240439798661242">"Calculating…"</string>
     <string name="memory_apps_usage" msgid="8818570780540532952">"Apps &amp; app data"</string>
     <string name="memory_media_usage" msgid="5161308657995646963">"Media"</string>
     <string name="memory_downloads_usage" msgid="8252462247720191179">"Downloads"</string>
@@ -1652,7 +1651,7 @@
     <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"Unmount shared storage"</string>
     <string name="sd_eject" product="default" msgid="8062832622096296251">"Unmount SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="6859940774161708871">"Unmount the internal USB storage"</string>
-    <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"Unmount the SD card so that you can remove it safely"</string>
+    <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"Unmount the SD card so you can safely remove it"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="9164545135649775664">"Insert USB storage for mounting"</string>
     <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"Insert an SD card for mounting"</string>
     <string name="sd_mount" product="nosdcard" msgid="8305985249945415150">"Mount USB storage"</string>
@@ -1664,14 +1663,14 @@
     <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"Erases all data on the internal USB storage, such as music and photos"</string>
     <string name="sd_format_summary" product="default" msgid="60583152211068164">"Erases all data on the SD card, such as music and photos"</string>
     <string name="mtp_ptp_mode_summary" msgid="7969656567437639239">"MTP or PTP function is active"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7694112411895701320">"Unmount USB storage"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7694112411895701320">"Unmount USB storage?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8251329019960361646">"Unmount SD card?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1212025106709645023">"If you unmount the USB storage, some apps that you are using will stop and may be unavailable until you remount the USB storage."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"If you unmount the SD card, some apps that you are using will stop and may be unavailable until you remount the SD card."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1212025106709645023">"If you unmount the USB storage, some apps you are using will stop and may be unavailable until you remount the USB storage."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"If you unmount the SD card, some apps you are using will stop and may be unavailable until you remount the SD card."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Cannot unmount USB storage. Try again later."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"Couldn\'t unmount SD card. Try again later."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Couldn’t unmount USB storage. Try again later."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"Couldn’t unmount SD card. Try again later."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"USB storage will be unmounted."</string>
     <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SD card will be unmounted."</string>
     <string name="sd_ejecting_title" msgid="1641122369013595273">"Unmounting"</string>
@@ -1687,7 +1686,7 @@
     <string name="storage_menu_format_option" msgid="4886059624052908432">"Format"</string>
     <string name="storage_menu_migrate" msgid="2196088149560070193">"Migrate data"</string>
     <string name="storage_menu_forget" msgid="5154017890033638936">"Forget"</string>
-    <string name="storage_menu_set_up" msgid="4401074025612064744">"Set-up"</string>
+    <string name="storage_menu_set_up" msgid="4401074025612064744">"Set up"</string>
     <string name="storage_menu_free" msgid="616100170298501673">"Free up space"</string>
     <string name="storage_menu_manage" msgid="7465522758801346408">"Manage storage"</string>
     <string name="keywords_storage_menu_free" msgid="2275406357317597106">"clean, storage"</string>
@@ -1696,34 +1695,34 @@
     <string name="storage_title_usb" msgid="1332488715547400452">"USB computer connection"</string>
     <string name="usb_connection_category" msgid="2288543238378907242">"Connect as"</string>
     <string name="usb_mtp_title" msgid="9068009584556422314">"Media device (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="6293240861011560842">"Lets you transfer media files on Windows or using Android File Transfer on Mac (see www.android.com/filetransfer)"</string>
+    <string name="usb_mtp_summary" msgid="6293240861011560842">"Lets you transfer media files on Windows, or using Android File Transfer on Mac (see www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="4496529268189091846">"Camera (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="8382539472311655671">"Lets you transfer photos using camera software and transfer any files on computers that don\'t support MTP"</string>
+    <string name="usb_ptp_summary" msgid="8382539472311655671">"Lets you transfer photos using camera software, and transfer any files on computers that don’t support MTP"</string>
     <string name="usb_midi_title" msgid="1139558846427981761">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="1842457325845863840">"Lets MIDI-enabled applications work over USB with MIDI software on your computer."</string>
+    <string name="usb_midi_summary" msgid="1842457325845863840">"Lets MIDI enabled applications work over USB with MIDI software on your computer."</string>
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_mount_success" msgid="393972242641313135">"<xliff:g id="NAME">%1$s</xliff:g> is mounted"</string>
-    <string name="storage_mount_failure" msgid="3667915814876418011">"Couldn\'t mount <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_mount_failure" msgid="3667915814876418011">"Couldn’t mount <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="6406298575402936148">"<xliff:g id="NAME">%1$s</xliff:g> is safely ejected"</string>
-    <string name="storage_unmount_failure" msgid="3796912279003790607">"Couldn\'t safely eject <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="3796912279003790607">"Couldn’t safely eject <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_format_success" msgid="3028114521294256851">"<xliff:g id="NAME">%1$s</xliff:g> is formatted"</string>
-    <string name="storage_format_failure" msgid="2042691589726261987">"Couldn\'t format <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_format_failure" msgid="2042691589726261987">"Couldn’t format <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_rename_title" msgid="5911285992205282312">"Rename storage"</string>
     <string name="storage_dialog_unmounted" msgid="1187960789775910051">"This <xliff:g id="NAME_0">^1</xliff:g> is safely ejected, but still available. \n\nTo use this <xliff:g id="NAME_1">^1</xliff:g>, you have to mount it first."</string>
     <string name="storage_dialog_unmountable" msgid="1761107904296941687">"This <xliff:g id="NAME_0">^1</xliff:g> is corrupted. \n\nTo use this <xliff:g id="NAME_1">^1</xliff:g>, you have to set it up first."</string>
-    <string name="storage_internal_format_details" msgid="2399034372813686846">"You can format this SD card to store photos, videos, music and more and access them on other devices. \n\n"<b>"All data on this SD card will be erased."</b>" \n\n"<b>"Before formatting"</b>" \n\n"<b>"Back up photos &amp; other media"</b>" \nMove your media files to alternative storage on this device or transfer them to a computer using a USB cable. \n\n"<b>"Back up apps"</b>" \nAll apps stored on this <xliff:g id="NAME">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device."</string>
+    <string name="storage_internal_format_details" msgid="2399034372813686846">"You can format this SD card to store photos, videos, music, and more and access them on other devices. \n\n"<b>"All data on this SD card will be erased."</b>" \n\n"<b>"Before formatting"</b>" \n\n"<b>"Back up photos &amp; other media"</b>" \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\n"<b>"Back up apps"</b>" \nAll apps stored on this <xliff:g id="NAME">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device."</string>
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"When you eject this <xliff:g id="NAME_0">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted."</b>" \n\nThis <xliff:g id="NAME_1">^1</xliff:g> is formatted to work on this device only. It won’t work on any others."</string>
-    <string name="storage_internal_forget_details" msgid="5606507270046186691">"To use the apps, photos or data this <xliff:g id="NAME">^1</xliff:g> contains, reinsert it. \n\nAlternatively, you can choose to forget this storage if the device isn’t available. \n\nIf you choose to forget, all the data the device contains will be lost forever. \n\nYou can reinstall the apps later, but their data stored on this device will be lost."</string>
+    <string name="storage_internal_forget_details" msgid="5606507270046186691">"To use the apps, photos, or data this <xliff:g id="NAME">^1</xliff:g> contains, reinsert it. \n\nAlternatively, you can choose to forget this storage if the device isn’t available. \n\nIf you choose to forget, all the data the device contains will be lost forever. \n\nYou can reinstall the apps later, but their data stored on this device will be lost."</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"Forget <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"All the apps, photos and data stored on this <xliff:g id="NAME">^1</xliff:g> will be lost forever."</string>
+    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"All the apps, photos, and data stored on this <xliff:g id="NAME">^1</xliff:g> will be lost forever."</string>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"System includes files used to run Android version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_wizard_guest" msgid="5813419895687733649">"Guest mode users cannot format SD cards"</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="5304499882951772292">"Format SD card for portable storage"</string>
-    <string name="storage_wizard_init_external_summary" msgid="5842588772292324473">"Save photos, videos, music and more and access them from other devices"</string>
+    <string name="storage_wizard_init_external_summary" msgid="5842588772292324473">"Save photos, videos, music, and more and access them from other devices"</string>
     <string name="storage_wizard_init_internal_title" msgid="8799676990387869411">"Format SD card for internal storage"</string>
     <string name="storage_wizard_init_internal_summary" msgid="8224648610422581704">"Save apps &amp; media to use on this phone only"</string>
     <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"Format as internal storage"</string>
@@ -1734,22 +1733,22 @@
     <string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
     <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
     <string name="storage_wizard_migrate_title" msgid="3013711737005104623">"Move data to new storage"</string>
-    <string name="storage_wizard_migrate_body" msgid="1630853797296198275">"You can move your photos, files and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
+    <string name="storage_wizard_migrate_body" msgid="1630853797296198275">"You can move your photos, files, and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
     <string name="storage_wizard_migrate_now" msgid="175023718337037181">"Move now"</string>
     <string name="storage_wizard_migrate_later" msgid="6573789572520980112">"Move later"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="255346780598924540">"Move data now"</string>
     <string name="storage_wizard_migrate_confirm_body" msgid="5039938578355576124"><b>"The move takes about <xliff:g id="TIME">^1</xliff:g>. It will free <xliff:g id="SIZE">^2</xliff:g> on <xliff:g id="NAME">^3</xliff:g>."</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="217478540562501692">"Move"</string>
     <string name="storage_wizard_migrate_progress_title" msgid="462238335086734131">"Moving data…"</string>
-    <string name="storage_wizard_migrate_details" msgid="7474061662976940407">"During the move: \n• Don\'t remove the <xliff:g id="NAME">^1</xliff:g>. \n• Some apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_migrate_details" msgid="7474061662976940407">"During the move: \n• Don’t remove the <xliff:g id="NAME">^1</xliff:g>. \n• Some apps won’t work correctly. \n• Keep the device charged."</string>
     <string name="storage_wizard_ready_title" msgid="3631022511474086605">"<xliff:g id="NAME">^1</xliff:g> formatted"</string>
     <string name="storage_wizard_ready_external_body" msgid="4264787122605706421">"You can start using your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_ready_internal_body" msgid="2416472979690681273">"You can start using your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"Move <xliff:g id="APP">^1</xliff:g>"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. \n\nDon\'t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
+    <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Moving <xliff:g id="APP">^1</xliff:g> and its data to <xliff:g id="NAME_0">^2</xliff:g> will take only a few moments. You won’t be able to use the app until the move is complete. \n\nDon’t remove the <xliff:g id="NAME_1">^2</xliff:g> during the move."</string>
     <string name="storage_wizard_move_unlock" msgid="14651384927767749">"To move data you need to unlock user <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Moving <xliff:g id="APP">^1</xliff:g>…"</string>
-    <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Don\'t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won\'t be available until the move is complete."</string>
+    <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> during the move. \n\nThe <xliff:g id="APP">^2</xliff:g> app on this device won’t be available until the move is complete."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="3494022998599718937">"Cancel move"</string>
     <string name="storage_wizard_slow_body" msgid="8293565076885232029">"This <xliff:g id="NAME_0">^1</xliff:g> appears to be slow. \n\nYou can continue, but apps moved to this location may stutter and data transfers may take a long time. \n\nConsider using a faster <xliff:g id="NAME_1">^1</xliff:g> for better performance."</string>
     <string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"How will you use this <xliff:g id="NAME">^1</xliff:g>?"</string>
@@ -1761,16 +1760,16 @@
     <string name="storage_wizard_init_v2_internal_action" product="default" msgid="274533758831212652">"Format"</string>
     <string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"Or"</string>
     <string name="storage_wizard_init_v2_external_title" msgid="2786416384217054112">"Format SD card for portable storage"</string>
-    <string name="storage_wizard_init_v2_external_summary" msgid="2002761631147966185">"Store photos, videos, music and more and access them from other devices. &lt;a href=https://support.google.com/android/answer/12153449&gt;Learn more about setting up an SD card&lt;/a&gt;."</string>
+    <string name="storage_wizard_init_v2_external_summary" msgid="2002761631147966185">"Store photos, videos, music, and more and access them from other devices. &lt;a href=https://support.google.com/android/answer/12153449&gt;Learn more about setting up an SD card&lt;/a&gt;."</string>
     <string name="storage_wizard_init_v2_external_action" msgid="6140058734875839081">"Format"</string>
     <string name="storage_wizard_init_v2_later" msgid="5366815913892609285">"Set up later"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="6294104100437326067">"Format this <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"This <xliff:g id="NAME_0">^1</xliff:g> needs to be formatted to store apps, files and media. \n\nFormatting will erase existing content on the <xliff:g id="NAME_1">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="NAME_2">^3</xliff:g> or device."</string>
-    <string name="storage_wizard_format_confirm_v2_body_external" msgid="5810296966099830035">"This <xliff:g id="NAME_0">^1</xliff:g> needs to be formatted to store photos, videos, music and more. \n\nFormatting will erase existing content on the <xliff:g id="NAME_1">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="NAME_2">^3</xliff:g> or device."</string>
+    <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"This <xliff:g id="NAME_0">^1</xliff:g> needs to be formatted to store apps, files, and media. \n\nFormatting will erase existing content on the <xliff:g id="NAME_1">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="NAME_2">^3</xliff:g> or device."</string>
+    <string name="storage_wizard_format_confirm_v2_body_external" msgid="5810296966099830035">"This <xliff:g id="NAME_0">^1</xliff:g> needs to be formatted to store photos, videos, music, and more. \n\nFormatting will erase existing content on the <xliff:g id="NAME_1">^2</xliff:g>. To avoid losing content, back it up to another <xliff:g id="NAME_2">^3</xliff:g> or device."</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="5718254101386377126">"Format <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="3471564531564756698">"Move content to <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4541523202790415721">"You can move files, media and certain apps to this <xliff:g id="NAME">^1</xliff:g>. \n\nThis move will free up <xliff:g id="SIZE">^2</xliff:g> of your tablet’s storage and should take around <xliff:g id="DURATION">^3</xliff:g>."</string>
-    <string name="storage_wizard_migrate_v2_body" product="default" msgid="809730501314645325">"You can move files, media and certain apps to this <xliff:g id="NAME">^1</xliff:g>. \n\nThis move will free up <xliff:g id="SIZE">^2</xliff:g> of your phone’s storage and should take around <xliff:g id="DURATION">^3</xliff:g>."</string>
+    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4541523202790415721">"You can move files, media, and certain apps to this <xliff:g id="NAME">^1</xliff:g>. \n\nThis move will free up <xliff:g id="SIZE">^2</xliff:g> of your tablet’s storage and should take around <xliff:g id="DURATION">^3</xliff:g>."</string>
+    <string name="storage_wizard_migrate_v2_body" product="default" msgid="809730501314645325">"You can move files, media, and certain apps to this <xliff:g id="NAME">^1</xliff:g>. \n\nThis move will free up <xliff:g id="SIZE">^2</xliff:g> of your phone’s storage and should take around <xliff:g id="DURATION">^3</xliff:g>."</string>
     <string name="storage_wizard_migrate_v2_checklist" msgid="2618258869444553060">"During the move:"</string>
     <string name="storage_wizard_migrate_v2_checklist_media" msgid="5867134681730723744">"Don’t remove the <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_checklist_apps" msgid="1882077445750580783">"Some apps won’t work"</string>
@@ -1781,7 +1780,7 @@
     <string name="storage_wizard_migrate_progress_v2_title" msgid="8791318509516968103">"Moving content…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="3760766921170980221">"Slow <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"You can still use this <xliff:g id="NAME_0">^1</xliff:g>, but it may be slow. \n\nApps stored on this <xliff:g id="NAME_1">^2</xliff:g> may not work properly, and content transfers could take a long time. \n\nTry using a faster <xliff:g id="NAME_2">^3</xliff:g>, or use this <xliff:g id="NAME_3">^4</xliff:g> for portable storage instead."</string>
-    <string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"Start again"</string>
+    <string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"Start over"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="7469713755893007901">"Continue"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="7688457485389886923">"You can start using your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_ready_v2_internal_body" msgid="3520269956641115883">"You can start using your <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1823,16 +1822,16 @@
     <string name="menu_save" msgid="6611465355127483100">"Save"</string>
     <string name="menu_cancel" msgid="1197826697950745335">"Cancel"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
-    <string name="error_name_empty" msgid="1258275899283079142">"The Name field can\'t be empty."</string>
-    <string name="error_apn_empty" msgid="7657491065443746915">"The APN cannot be empty."</string>
+    <string name="error_name_empty" msgid="1258275899283079142">"The Name field can’t be empty."</string>
+    <string name="error_apn_empty" msgid="7657491065443746915">"The APN can’t be empty."</string>
     <string name="error_mcc_not3" msgid="883659545640179094">"MCC field must be 3 digits."</string>
     <string name="error_mnc_not23" msgid="7642478711158474918">"MNC field must be 2 or 3 digits."</string>
     <string name="error_adding_apn_type" msgid="1324263534991467943">"Carrier does not allow adding APNs of type %s."</string>
     <string name="restore_default_apn" msgid="6596048535642130689">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="4310539620115151551">"Reset to default"</string>
-    <string name="restore_default_apn_completed" msgid="5167505087078340256">"Reset default APN settings completed"</string>
+    <string name="restore_default_apn_completed" msgid="5167505087078340256">"Reset default APN settings completed."</string>
     <string name="reset_dashboard_title" msgid="7423200250697886918">"Reset options"</string>
-    <string name="reset_dashboard_summary" msgid="4390780188264852956">"Network, apps or device can be reset"</string>
+    <string name="reset_dashboard_summary" msgid="4390780188264852956">"Network, apps, or device can be reset"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps can be reset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reset Wi-Fi, mobile and Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
@@ -1846,19 +1845,19 @@
     <string name="reset_network_confirm_title" msgid="913014422184481270">"Reset?"</string>
     <string name="network_reset_not_available" msgid="1966334631394607829">"Network reset is not available for this user"</string>
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
-    <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
-    <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
+    <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t erase SIMs"</string>
+    <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
     <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
     <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
     <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed into the following accounts:\n"</string>
     <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
     <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
     <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
     <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures, and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures, and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
@@ -1897,31 +1896,31 @@
     <string name="tether_settings_summary_hotspot_and_bluetooth_and_ethernet" msgid="4104425838594994441">"Hotspot, Bluetooth, Ethernet"</string>
     <string name="tether_settings_summary_usb_and_bluetooth_and_ethernet" msgid="5880591133984166550">"USB, Bluetooth, Ethernet"</string>
     <string name="tether_settings_summary_all" msgid="7565193614882005775">"Hotspot, USB, Bluetooth, Ethernet"</string>
-    <string name="tether_settings_summary_off" msgid="2526164899130351968">"Not sharing Internet with other devices"</string>
+    <string name="tether_settings_summary_off" msgid="2526164899130351968">"Not sharing internet with other devices"</string>
     <string name="tethering_interface_options" msgid="7575535888135143650">"Tethering"</string>
     <string name="disable_wifi_hotspot_title" msgid="2167985468585290478">"Don’t use Wi‑Fi hotspot"</string>
-    <string name="disable_wifi_hotspot_when_usb_on" msgid="220439059794714583">"Only share Internet via USB"</string>
-    <string name="disable_wifi_hotspot_when_bluetooth_on" msgid="4711723299880116345">"Only share Internet via Bluetooth"</string>
-    <string name="disable_wifi_hotspot_when_ethernet_on" msgid="4123242400542103599">"Only share Internet via Ethernet"</string>
-    <string name="disable_wifi_hotspot_when_usb_and_bluetooth_on" msgid="5258774769658150180">"Only share Internet via USB and Bluetooth"</string>
-    <string name="disable_wifi_hotspot_when_usb_and_ethernet_on" msgid="7126313562907225612">"Only share Internet via USB and Ethernet"</string>
-    <string name="disable_wifi_hotspot_when_bluetooth_and_ethernet_on" msgid="2943464651349235967">"Only share Internet via Bluetooth and Ethernet"</string>
-    <string name="disable_wifi_hotspot_when_usb_and_bluetooth_and_ethernet_on" msgid="3934609816834760008">"Only share Internet via USB, Bluetooth and Ethernet"</string>
+    <string name="disable_wifi_hotspot_when_usb_on" msgid="220439059794714583">"Only share internet via USB"</string>
+    <string name="disable_wifi_hotspot_when_bluetooth_on" msgid="4711723299880116345">"Only share internet via Bluetooth"</string>
+    <string name="disable_wifi_hotspot_when_ethernet_on" msgid="4123242400542103599">"Only share internet via Ethernet"</string>
+    <string name="disable_wifi_hotspot_when_usb_and_bluetooth_on" msgid="5258774769658150180">"Only share internet via USB and Bluetooth"</string>
+    <string name="disable_wifi_hotspot_when_usb_and_ethernet_on" msgid="7126313562907225612">"Only share internet via USB and Ethernet"</string>
+    <string name="disable_wifi_hotspot_when_bluetooth_and_ethernet_on" msgid="2943464651349235967">"Only share internet via Bluetooth and Ethernet"</string>
+    <string name="disable_wifi_hotspot_when_usb_and_bluetooth_and_ethernet_on" msgid="3934609816834760008">"Only share internet via USB, Bluetooth and Ethernet"</string>
     <string name="usb_title" msgid="1157283449840612901">"USB"</string>
     <string name="usb_tethering_button_text" msgid="7364633823180913777">"USB tethering"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="3168636595109044213">"Share phone’s Internet connection via USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="1749659335004856576">"Share tablet’s Internet connection via USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3168636595109044213">"Share phone’s internet connection via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="1749659335004856576">"Share tablet’s internet connection via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"Bluetooth tethering"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="2023654677593885805">"Share tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="4322810060538179348">"Share phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6941934844527406581">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="2023654677593885805">"Share tablet’s internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="4322810060538179348">"Share phone’s internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6941934844527406581">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>’s internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can’t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="tablet" msgid="8796744370636115313">"Share tablet’s Internet connection via Ethernet"</string>
-    <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
-    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s internet connection via Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="tablet" msgid="8796744370636115313">"Share tablet’s internet connection via Ethernet"</string>
+    <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
+    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Mobile network"</string>
     <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mobile plan"</string>
@@ -1960,8 +1959,8 @@
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
-    <string name="location_services_preference_title" msgid="604317859531782159">"Location Services"</string>
-    <string name="location_services_screen_title" msgid="5640002489976602476">"Location Services"</string>
+    <string name="location_services_preference_title" msgid="604317859531782159">"Location services"</string>
+    <string name="location_services_screen_title" msgid="5640002489976602476">"Location services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Use location to set time zone"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Device location needed"</string>
@@ -1973,7 +1972,7 @@
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; mobile network location"</string>
-    <string name="location_neighborhood_level" msgid="3668890550358558267">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
+    <string name="location_neighborhood_level" msgid="3668890550358558267">"Let apps use Google’s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Location determined by Wi‑Fi"</string>
     <string name="location_gps" msgid="8783616672454701134">"GPS satellites"</string>
     <string name="location_street_level" product="tablet" msgid="865953107414742784">"Let apps use GPS on your tablet to pinpoint your location"</string>
@@ -1995,22 +1994,22 @@
     <string name="contributors_title" msgid="7965640251547037965">"Contributors"</string>
     <string name="manual" msgid="3651593989906084868">"Manual"</string>
     <string name="regulatory_labels" msgid="5960251403367154270">"Regulatory labels"</string>
-    <string name="safety_and_regulatory_info" msgid="8285048080439298528">"Safety and regulatory manual"</string>
+    <string name="safety_and_regulatory_info" msgid="8285048080439298528">"Safety &amp; regulatory manual"</string>
     <string name="copyright_title" msgid="83245306827757857">"Copyright"</string>
-    <string name="license_title" msgid="8745742085916617540">"Licence"</string>
-    <string name="module_license_title" msgid="8705484239826702828">"Google Play system update licences"</string>
+    <string name="license_title" msgid="8745742085916617540">"License"</string>
+    <string name="module_license_title" msgid="8705484239826702828">"Google Play system update licenses"</string>
     <string name="terms_title" msgid="2071742973672326073">"Terms and conditions"</string>
-    <string name="webview_license_title" msgid="5832692241345780517">"System WebView Licence"</string>
+    <string name="webview_license_title" msgid="5832692241345780517">"System WebView License"</string>
     <string name="wallpaper_attributions" msgid="4323659759250650736">"Wallpaper credits"</string>
-    <string name="wallpaper_attributions_values" msgid="987277439026021925">"Satellite imagery providers:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="987277439026021925">"Satellite imagery providers:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="1682978148920788484">"Manual"</string>
     <string name="settings_manual_activity_unavailable" msgid="2514549851682321576">"There is a problem loading the manual."</string>
-    <string name="settings_license_activity_title" msgid="7832071619364734914">"Third-party licences"</string>
-    <string name="settings_license_activity_unavailable" msgid="9014803774391134570">"There is a problem loading the licences."</string>
+    <string name="settings_license_activity_title" msgid="7832071619364734914">"Third-party licenses"</string>
+    <string name="settings_license_activity_unavailable" msgid="9014803774391134570">"There is a problem loading the licenses."</string>
     <string name="settings_license_activity_loading" msgid="1653151990366578827">"Loading…"</string>
     <string name="settings_safetylegal_title" msgid="1334501164265709288">"Safety information"</string>
     <string name="settings_safetylegal_activity_title" msgid="2218587051061093358">"Safety information"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="6571695168138207587">"You don’t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="6571695168138207587">"You don’t have a data connection. To view this information now, go to %s from any computer connected to the internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="1757860124583063395">"Loading…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="2407205113298094824">"Set a password"</string>
     <string name="lockpassword_choose_your_profile_password_header" msgid="7038997227611893312">"Set a work password"</string>
@@ -2031,11 +2030,11 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="2241722970567131308">"Re-enter your PIN"</string>
     <string name="lockpassword_reenter_your_profile_pin_header" msgid="2890233614560435538">"Re-enter your work PIN"</string>
     <string name="lockpassword_confirm_your_work_pin_header" msgid="4229765521391960255">"Enter your work PIN"</string>
-    <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passwords don\'t match"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINs don\'t match"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="2100071354970605232">"Passwords don’t match"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="1103699575489401030">"PINs don’t match"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="1045638030120803622">"Draw your pattern again"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="5669348379247148696">"Unlock selection"</string>
-    <string name="lockpassword_password_set_toast" msgid="6615759749393973795">"password has been set"</string>
+    <string name="lockpassword_password_set_toast" msgid="6615759749393973795">"Password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="3090582314362416762">"Pattern has been set"</string>
     <string name="lockpassword_choose_your_password_header_for_face" msgid="622276003801157839">"To use Face Unlock, set password"</string>
@@ -2046,7 +2045,7 @@
     <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="9086039918921009380">"Set a PIN to use face or fingerprint"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Forgot your password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Forgot your pattern?"</string>
-    <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Forgotten your PIN?"</string>
+    <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Forgot your PIN?"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="7692794426682501482">"Use your device pattern to continue"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="9206928587904701094">"Enter your device PIN to continue"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="2616127423884477152">"Enter your device password to continue"</string>
@@ -2108,7 +2107,7 @@
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"Manage and remove installed apps"</string>
     <string name="applications_settings" msgid="1941993743933425622">"App info"</string>
-    <string name="applications_settings_summary" msgid="8206066893744768531">"Manage apps, set up quick-launch shortcuts"</string>
+    <string name="applications_settings_summary" msgid="8206066893744768531">"Manage apps, set up quick launch shortcuts"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"App settings"</string>
     <string name="install_applications" msgid="3921609656584369901">"Unknown sources"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"Allow all app sources"</string>
@@ -2118,7 +2117,7 @@
       <item quantity="one">See all apps</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contact your IT admin"</string>
-    <string name="forgot_password_text" msgid="2583194470767613163">"They can help you reset your PIN, pattern or password"</string>
+    <string name="forgot_password_text" msgid="2583194470767613163">"They can help you reset your PIN, pattern, or password"</string>
     <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="652516435709047343">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use."</string>
@@ -2154,8 +2153,8 @@
     <string name="clear_user_data_text" msgid="6773186434260397947">"Clear storage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Uninstall updates"</string>
     <string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Allow restricted settings"</string>
-    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Some activities that you’ve selected open in this app by default."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"You\'ve chosen to allow this app to create widgets and access their data."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Some activities you’ve selected open in this app by default."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"You’ve chosen to allow this app to create widgets and access their data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No defaults set."</string>
     <string name="clear_activities" msgid="488089228657585700">"Clear default preferences"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
@@ -2193,13 +2192,13 @@
     <string name="dlg_cancel" msgid="5164705061530774899">"Cancel"</string>
     <string name="dlg_delete" msgid="1790919205039397659">"Delete"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
-    <string name="app_not_found_dlg_text" msgid="8634675268730513704">"The app wasn\'t found in the list of installed apps."</string>
+    <string name="app_not_found_dlg_text" msgid="8634675268730513704">"The app wasn’t found in the list of installed apps."</string>
     <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Couldn’t clear storage for app."</string>
     <string name="join_two_items" msgid="7893073836681382429">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="5301233410730513655">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="4915310659841174866">"Computing…"</string>
-    <string name="invalid_size_value" msgid="7017371543563259201">"Couldn\'t compute the package size."</string>
-    <string name="version_text" msgid="7628938665256107608">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="invalid_size_value" msgid="7017371543563259201">"Couldn’t compute package size."</string>
+    <string name="version_text" msgid="7628938665256107608">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5421158479447276791">"Move"</string>
     <string name="move_app_to_internal" product="tablet" msgid="5799782476959541144">"Move to tablet"</string>
     <string name="move_app_to_internal" product="default" msgid="7395498801589544372">"Move to phone"</string>
@@ -2207,17 +2206,17 @@
     <string name="move_app_to_sdcard" product="default" msgid="7161667212614143767">"Move to SD card"</string>
     <string name="another_migration_already_in_progress" msgid="6550546307856052261">"Another migration is already in progress."</string>
     <string name="insufficient_storage" msgid="8115088042669030558">"Not enough storage space."</string>
-    <string name="does_not_exist" msgid="6499163879348776120">"App doesn\'t exist."</string>
-    <string name="invalid_location" msgid="8013853455355520557">"Install location isn\'t valid."</string>
-    <string name="system_package" msgid="7559476279008519360">"System updates cannot be installed on external media."</string>
+    <string name="does_not_exist" msgid="6499163879348776120">"App doesn’t exist."</string>
+    <string name="invalid_location" msgid="8013853455355520557">"Install location isn’t valid."</string>
+    <string name="system_package" msgid="7559476279008519360">"System updates can’t be installed on external media."</string>
     <string name="move_error_device_admin" msgid="1561502976834303626">"Device admin app can\'t be installed on external media"</string>
     <string name="force_stop_dlg_title" msgid="86745852555490146">"Force stop?"</string>
-    <string name="force_stop_dlg_text" msgid="1527286468544457368">"If you force-stop an app, it may misbehave."</string>
+    <string name="force_stop_dlg_text" msgid="1527286468544457368">"If you force stop an app, it may misbehave."</string>
     <string name="app_install_location_title" msgid="8932938164156303191">"Preferred install location"</string>
-    <string name="app_install_location_summary" msgid="4948270795544357021">"Change the preferred installation location for new applications."</string>
+    <string name="app_install_location_summary" msgid="4948270795544357021">"Change the preferred installation location for new apps"</string>
     <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Disable app"</string>
     <string name="app_disable_dlg_text" msgid="2449382902751908916">"If you disable this app, Android and other apps may no longer function as intended. Keep in mind, you can’t delete this app since it came pre-installed on your device. By disabling, you turn this app off and hide it on your device."</string>
-    <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Turn off notifications"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="6686569904059411780">"Turn off notifications?"</string>
     <string name="app_install_details_group_title" msgid="1172114479073704677">"Store"</string>
     <string name="app_install_details_title" msgid="7783556181897142187">"App details"</string>
     <string name="app_install_details_summary" msgid="2013043219249992373">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2259,42 +2258,42 @@
     <string name="service_stop" msgid="5712522600201308795">"Stop"</string>
     <string name="service_manage" msgid="3896322986828332075">"Settings"</string>
     <string name="service_stop_description" msgid="6327742632400026677">"This service was started by its app. Stopping it may cause the app to fail."</string>
-    <string name="heavy_weight_stop_description" msgid="3086419998820881290">"This app can\'t be stopped safely. If you stop it, you may lose some of your current work."</string>
-    <string name="background_process_stop_description" msgid="4792038933517438037">"This is an old app process that is still running in case it\'s needed again. There is usually no reason to stop it."</string>
+    <string name="heavy_weight_stop_description" msgid="3086419998820881290">"This app can’t safely be stopped. If you stop it, you may lose some of your current work."</string>
+    <string name="background_process_stop_description" msgid="4792038933517438037">"This is an old app process that is still running in case it’s needed again. There is usually no reason to stop it."</string>
     <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: currently in use. Tap Settings to control it."</string>
     <string name="main_running_process_description" msgid="6685973937935027773">"Main process in use."</string>
     <string name="process_service_in_use_description" msgid="4210957264507014878">"Service <xliff:g id="COMP_NAME">%1$s</xliff:g> is in use."</string>
     <string name="process_provider_in_use_description" msgid="6730020083976048028">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> is in use."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="6201041461740445113">"Stop system service?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="2076922609580490122">"If you stop this service, some features of your tablet may stop working correctly until you turn it off and then on again."</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="2625863973434309085">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="2076922609580490122">"If you stop this service, some features of your tablet may stop working correctly until you power it off and then on again."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="2625863973434309085">"If you stop this service, some features of your phone may stop working correctly until you power it off and then on again."</string>
     <string name="language_input_gesture_title" msgid="3292455685728572960">"Languages, input &amp; gestures"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="8670153838520237089"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="2738661322747920463"></string>
     <string name="language_input_gesture_summary_off" msgid="1604575860215661606"></string>
-    <string name="language_settings" msgid="8700174277543875046">"Languages and input"</string>
+    <string name="language_settings" msgid="8700174277543875046">"Languages &amp; input"</string>
     <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"You don’t have permission to change the device language."</string>
-    <string name="language_keyboard_settings_title" msgid="7934844313233544557">"Languages and input"</string>
+    <string name="language_keyboard_settings_title" msgid="7934844313233544557">"Languages &amp; input"</string>
     <string name="input_assistance" msgid="3437568284144952104">"Tools"</string>
     <string name="keyboard_settings_category" msgid="5392847229300117064">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="5986939176239963826">"Languages"</string>
     <string name="phone_language_summary" msgid="863041222809685325"></string>
     <string name="auto_replace" msgid="4830732960264447043">"Auto-replace"</string>
     <string name="auto_replace_summary" msgid="1285443414597153423">"Correct mistyped words"</string>
-    <string name="auto_caps" msgid="5573583581288305355">"Auto-capitalisation"</string>
-    <string name="auto_caps_summary" msgid="3144141933426846665">"Capitalise first letter in sentences"</string>
+    <string name="auto_caps" msgid="5573583581288305355">"Auto-capitalization"</string>
+    <string name="auto_caps_summary" msgid="3144141933426846665">"Capitalize first letter in sentences"</string>
     <string name="auto_punctuate" msgid="2838809477621809507">"Auto-punctuate"</string>
     <string name="hardkeyboard_category" msgid="8729780593378161071">"Physical keyboard settings"</string>
     <string name="auto_punctuate_summary" msgid="3549190848611386748">"Press Space key twice to insert \".\""</string>
     <string name="show_password" msgid="7101900779571040117">"Show passwords"</string>
     <string name="show_password_summary" msgid="9025960283785111619">"Display characters briefly as you type"</string>
-    <string name="spellchecker_security_warning" msgid="2016059050608271820">"This spell checker may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Use this spell checker?"</string>
+    <string name="spellchecker_security_warning" msgid="2016059050608271820">"This spell checker may be able to collect all the text you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Use this spell checker?"</string>
     <string name="spellchecker_quick_settings" msgid="6449414356743946577">"Settings"</string>
     <string name="spellchecker_language" msgid="8905487366580285282">"Language"</string>
     <string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"Keyboards"</string>
     <string name="virtual_keyboard_category" msgid="2339505603075527212">"On-screen keyboard"</string>
     <string name="keywords_virtual_keyboard" msgid="1494726424879503434">"Gboard"</string>
-    <string name="available_virtual_keyboard_category" msgid="6930012948152749337">"Available on-screen keyboard"</string>
+    <string name="available_virtual_keyboard_category" msgid="6930012948152749337">"Available On-screen keyboard"</string>
     <string name="add_virtual_keyboard" msgid="2515850206289352606">"Manage on-screen keyboards"</string>
     <string name="keyboard_assistance_category" msgid="7320599809770932032">"Keyboard assistance"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"Physical keyboard"</string>
@@ -2317,12 +2316,12 @@
     <string name="keyboard_layout_picker_title" msgid="240504762718562906">"Keyboard layouts"</string>
     <string name="user_dict_settings_title" msgid="680410651924276991">"Personal dictionary"</string>
     <string name="user_dict_settings_for_work_title" msgid="1245315720684961770">"Personal dictionary for work"</string>
-    <string name="user_dict_settings_summary" msgid="4939694372338975081">"Add words to be used in apps such as spell checker"</string>
+    <string name="user_dict_settings_summary" msgid="4939694372338975081">"Add words to be used in apps such as Spell checker"</string>
     <string name="user_dict_settings_add_menu_title" msgid="8046882347281382968">"Add"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="3485845465134083084">"Add to dictionary"</string>
     <string name="user_dict_settings_add_screen_title" msgid="1866408024073475379">"Phrase"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="2642928746425808108">"More options"</string>
-    <string name="user_dict_settings_add_dialog_less_options" msgid="100432503633458156">"Fewer options"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="100432503633458156">"Less options"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="1866751313790655088">"OK"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="2686051785623698231">"Word:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="5722204336242646866">"Shortcut:"</string>
@@ -2348,9 +2347,9 @@
     <string name="configure_input_method" msgid="8831343065130376880">"Set up input methods"</string>
     <string name="input_method_settings" msgid="4177883733022569830">"Settings"</string>
     <string name="input_method_settings_button" msgid="5145039044301426311">"Settings"</string>
-    <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
+    <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> settings"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="8940326108334307057">"Choose active input methods"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"On-screen keyboard settings"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"Onscreen keyboard settings"</string>
     <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"Physical keyboard"</string>
     <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"Physical keyboard settings"</string>
     <string name="gadget_picker_title" msgid="7615902510050731400">"Choose gadget"</string>
@@ -2367,15 +2366,15 @@
     <string name="accessibility_settings" msgid="4713215774904704682">"Accessibility"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Accessibility settings"</string>
     <string name="accessibility_settings_summary" msgid="2366627644570558503">"Display, interaction, audio"</string>
-    <string name="vision_settings_title" msgid="8919983801864103069">"Vision settings"</string>
-    <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
+    <string name="vision_settings_title" msgid="8919983801864103069">"Vision Settings"</string>
+    <string name="vision_settings_description" msgid="7614894785054441991">"You can customize this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"Screen reader"</string>
     <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
     <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
-    <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Colour and motion"</string>
+    <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Color and motion"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaction controls"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Timing controls"</string>
@@ -2406,7 +2405,7 @@
     <string name="accessibility_magnification_mode_dialog_option_switch" msgid="561043521011229424">"Switch between full and partial screen"</string>
     <string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"Tap the switch button to move between both options"</string>
     <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
-    <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"Using triple-tap to magnify part of your screen causes typing and other delays.\n\nThe Accessibility button floats on your screen over other apps. Tap it to magnify."</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"Using triple-tap to magnify part of your screen causes typing and other delays.\n\nThe accessibility button floats on your screen over other apps. Tap it to magnify."</string>
     <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
     <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="7115794462123071594">"Use triple-tap"</string>
     <string name="accessibility_magnification_triple_tap_warning_title" msgid="8484669851397296597">"This may slow down your keyboard"</string>
@@ -2427,7 +2426,7 @@
     <string name="accessibility_text_reading_reset_message" msgid="824644303661026712">"Display size and text settings have been reset"</string>
     <string name="accessibility_text_reading_confirm_dialog_title" msgid="2865331351355690389">"Reset display size and text?"</string>
     <string name="accessibility_text_reading_confirm_dialog_message" product="default" msgid="517090197003540264">"Your display size and text preferences will reset to the phone’s original settings"</string>
-    <string name="accessibility_text_reading_confirm_dialog_message" product="tablet" msgid="1291629915534156671">"Your display size and text preferences will be reset to the tablet’s original settings"</string>
+    <string name="accessibility_text_reading_confirm_dialog_message" product="tablet" msgid="1291629915534156671">"Your display size and text preferences will reset to the tablet’s original settings"</string>
     <string name="accessibility_text_reading_confirm_dialog_reset_button" msgid="8215800137850243736">"Reset"</string>
     <string name="accessibility_text_reading_conversation_message_1" msgid="7883952203831957831">"Any weekend plans?"</string>
     <string name="accessibility_text_reading_conversation_message_2" msgid="8112160435318635856">"Heading to the beach. Want to join?"</string>
@@ -2436,43 +2435,43 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
     <string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Quickly zoom in on the screen to make content larger"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag 2 fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with 2 fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch &amp; hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
-    <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
+    <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="6800684770875867559">"Use accessibility gesture"</string>
-    <string name="accessibility_tutorial_dialog_message_button" msgid="7002398857479782303">"To use this feature, tap the accessibility button <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> on the bottom of your screen.\n\nTo switch between features, touch and hold the accessibility button."</string>
-    <string name="accessibility_tutorial_dialog_message_floating_button" msgid="2551777208185138391">"To use this feature, tap the Accessibility button on your screen."</string>
-    <string name="accessibility_tutorial_dialog_message_volume" msgid="5033080515460519183">"To use this feature, press and hold both volume keys."</string>
+    <string name="accessibility_tutorial_dialog_message_button" msgid="7002398857479782303">"To use this feature, tap the accessibility button <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> on the bottom of your screen.\n\nTo switch between features, touch &amp; hold the accessibility button."</string>
+    <string name="accessibility_tutorial_dialog_message_floating_button" msgid="2551777208185138391">"To use this feature, tap the accessibility button on your screen."</string>
+    <string name="accessibility_tutorial_dialog_message_volume" msgid="5033080515460519183">"To use this feature, press &amp; hold both volume keys."</string>
     <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"To start and stop magnification, triple-tap anywhere on your screen."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"To use this feature, swipe up from the bottom of the screen with two fingers.\n\nTo switch between features, swipe up with two fingers and hold."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"To use this feature, swipe up from the bottom of the screen with three fingers.\n\nTo switch between features, swipe up with three fingers and hold."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"To use an accessibility feature, swipe up from the bottom of the screen with two fingers.\n\nTo switch between features, swipe up with two fingers and hold."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"To use an accessibility feature, swipe up from the bottom of the screen with three fingers.\n\nTo switch between features, swipe up with three fingers and hold."</string>
-    <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
+    <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"To use this feature, swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"To use this feature, swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"To use an accessibility feature, swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"To use an accessibility feature, swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold."</string>
+    <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"Got it"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g> shortcut"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Accessibility button"</string>
     <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="5489284264414421286">"Accessibility gesture"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Swipe up with 2 fingers"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Swipe up with three fingers"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Swipe up with 3 fingers"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"Tap accessibility button"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_by_gesture" msgid="3981188764050497346">"Use accessibility gesture"</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"Tap the accessibility button <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> at the bottom of your screen.\n\nTo switch between features, touch and hold the accessibility button."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"Tap the accessibility button <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> at the bottom of your screen.\n\nTo switch between features, touch &amp; hold the accessibility button."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"Swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold."</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Swipe up from the bottom of the screen with three fingers.\n\nTo switch between features, swipe up with three fingers and hold."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_floating" msgid="4459254227203203324"><annotation id="link">"More options"</annotation></string>
     <string name="footer_learn_more_content_description" msgid="8843798273152131341">"Learn more about <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"Hold volume keys"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"hold volume keys"</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"Press and hold both volume keys"</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"Press &amp; hold both volume keys"</string>
     <string name="accessibility_shortcut_edit_dialog_title_triple_tap" msgid="6672798007229795841">"Triple-tap screen"</string>
     <string name="accessibility_shortcut_triple_tap_keyword" msgid="6863958573135995927">"triple-tap screen"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_triple_tap" msgid="2102327956423320536">"Quickly tap screen {0,number,integer} times. This shortcut may slow down your device"</string>
     <string name="accessibility_shortcut_edit_dialog_title_advance" msgid="4567868630655591506">"Advanced"</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="266736851606791552">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="266736851606791552">"The Accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the Accessibility button, then select magnification."</string>
     <string name="accessibility_screen_magnification_gesture_navigation_warning" msgid="991017769735632046">"The accessibility gesture is set to the <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, swipe up with two fingers from the bottom of the screen and hold. Then select magnification."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3713636732641882959">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="6842883700702723355">"Shortcut service"</string>
@@ -2497,12 +2496,12 @@
     <string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Transparency when not in use"</string>
     <string name="accessibility_button_low_label" msgid="4193015407828927741">"Transparent"</string>
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Non-transparent"</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"High-contrast text"</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Change text colour to black or white. Maximises contrast with the background."</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"High contrast text"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Change text color to black or white. Maximizes contrast with the background."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Auto update screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Update screen magnification on app transitions"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
-    <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse pointer"</string>
     <string name="accessibility_toggle_large_pointer_icon_summary" msgid="1480527946039237705">"Make the mouse pointer more noticeable"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
     <string name="accessibility_disable_animations_summary" msgid="5828228669556554565">"Reduce movement on the screen"</string>
@@ -2517,23 +2516,23 @@
     <string name="accessibility_timeout_1min" msgid="4804644263166961262">"1 minute"</string>
     <string name="accessibility_timeout_2mins" msgid="7901692984522708679">"2 minutes"</string>
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"Time to take action (Accessibility timeout)"</string>
-    <string name="accessibility_control_timeout_about_title" msgid="813588002683460837">"About time to take action (accessibility timeout)"</string>
-    <string name="accessibility_control_timeout_footer_learn_more_content_description" msgid="8118584413220542193">"Learn more about time to take action (accessibility timeout)"</string>
+    <string name="accessibility_control_timeout_about_title" msgid="813588002683460837">"About time to take action (Accessibility timeout)"</string>
+    <string name="accessibility_control_timeout_footer_learn_more_content_description" msgid="8118584413220542193">"Learn more about time to take action (Accessibility timeout)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Time to take action"</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="4037051091059316310">"This timing preference isn’t supported by all apps"</string>
     <string name="accessibility_control_timeout_preference_intro_text" msgid="1398116710556762245">"Choose how long to show temporary messages that ask you to take action"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Touch and hold delay"</string>
-    <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Colour inversion"</string>
-    <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Use colour inversion"</string>
-    <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Colour inversion shortcut"</string>
-    <string name="accessibility_display_inversion_preference_intro_text" msgid="1159663288481145318">"Colour inversion turns light screens dark. It also turns dark screens light."</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"&lt;b&gt;Keep in mind&lt;/b&gt;&lt;br/&gt; &lt;ol&gt; &lt;li&gt; Colours will change in media and images&lt;/li&gt; &lt;li&gt; Colour inversion works on all apps&lt;/li&gt; &lt;li&gt; To display a dark background, Dark theme can be used instead&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Color inversion"</string>
+    <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Use color inversion"</string>
+    <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Color inversion shortcut"</string>
+    <string name="accessibility_display_inversion_preference_intro_text" msgid="1159663288481145318">"Color inversion turns light screens dark. It also turns dark screens light."</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"&lt;b&gt;Keep in mind&lt;/b&gt;&lt;br/&gt; &lt;ol&gt; &lt;li&gt; Colors will change in media and images&lt;/li&gt; &lt;li&gt; Color inversion works on all apps&lt;/li&gt; &lt;li&gt; To display a dark background, Dark theme can be used instead&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Autoclick (dwell timing)"</string>
-    <string name="accessibility_autoclick_about_title" msgid="152923024405552594">"About auto-click (dwell timing)"</string>
+    <string name="accessibility_autoclick_about_title" msgid="152923024405552594">"About autoclick (dwell timing)"</string>
     <string name="accessibility_autoclick_footer_learn_more_content_description" msgid="7056189627042350691">"Learn more about autoclick (dwell timing)"</string>
     <string name="accessibility_autoclick_intro_text" msgid="8959680635470639347">"You can set a connected mouse to click automatically when the cursor stops moving for a certain amount of time"</string>
     <string name="accessibility_autoclick_description" msgid="6695732131412361101">"Autoclick can be helpful if clicking the mouse is difficult"</string>
-    <string name="accessibility_autoclick_default_title" msgid="2024730028293793490">"Auto-click off"</string>
+    <string name="accessibility_autoclick_default_title" msgid="2024730028293793490">"Autoclick off"</string>
     <string name="accessibility_autoclick_short_title" msgid="7938302504358912984">"Short"</string>
     <string name="accessibility_autoclick_short_summary" msgid="4106953930081213514">"0.2 seconds"</string>
     <string name="accessibility_autoclick_medium_title" msgid="3134175117576834320">"Medium"</string>
@@ -2544,7 +2543,7 @@
     <string name="accessibility_autoclick_shorter_desc" msgid="7631013255724544348">"Shorter"</string>
     <string name="accessibility_autoclick_longer_desc" msgid="2566025502981487443">"Longer"</string>
     <string name="accessibility_autoclick_seekbar_desc" msgid="8363959277814621118">"Auto click time"</string>
-    <string name="accessibility_vibration_settings_title" msgid="936301142478631993">"Vibration and haptics"</string>
+    <string name="accessibility_vibration_settings_title" msgid="936301142478631993">"Vibration &amp; haptics"</string>
     <string name="accessibility_vibration_settings_summary" msgid="3690308537483465527">"Control the vibration strength for different usages"</string>
     <string name="accessibility_vibration_settings_state_on" msgid="5566026932372832502">"On"</string>
     <string name="accessibility_vibration_settings_state_off" msgid="7946588741954981703">"Off"</string>
@@ -2552,7 +2551,7 @@
     <string name="accessibility_call_vibration_category_title" msgid="2545607568768192318">"Calls"</string>
     <string name="accessibility_notification_alarm_vibration_category_title" msgid="2683635252414849417">"Notifications and alarms"</string>
     <string name="accessibility_interactive_haptics_category_title" msgid="3162855291184592021">"Interactive haptics"</string>
-    <string name="accessibility_vibration_primary_switch_title" msgid="6162579254864450592">"Use vibration and haptics"</string>
+    <string name="accessibility_vibration_primary_switch_title" msgid="6162579254864450592">"Use vibration &amp; haptics"</string>
     <string name="accessibility_alarm_vibration_title" msgid="4661294337828522745">"Alarm vibration"</string>
     <string name="accessibility_media_vibration_title" msgid="1372073715403945428">"Media vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
@@ -2560,42 +2559,42 @@
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
     <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
     <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_auto_added_qs_tooltip_content" msgid="2941824314912928072">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> added to Quick Settings. Swipe down to turn it on or off at any time."</string>
+    <string name="accessibility_service_auto_added_qs_tooltip_content" msgid="2941824314912928072">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> added to Quick Settings. Swipe down to turn it on or off anytime."</string>
     <string name="accessibility_service_qs_tooltip_content" msgid="6002493441414967868">"You can also add <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> to Quick Settings from the top of your screen"</string>
-    <string name="accessibility_color_correction_auto_added_qs_tooltip_content" msgid="9092661358437404374">"Colour correction added to Quick Settings. Swipe down to turn it on or off at any time."</string>
-    <string name="accessibility_color_correction_qs_tooltip_content" msgid="3258628434235475205">"You can also add colour correction to Quick Settings from the top of your screen"</string>
-    <string name="accessibility_color_inversion_auto_added_qs_tooltip_content" msgid="7267618234972101725">"Colour inversion added to Quick Settings. Swipe down to turn it on or off at any time."</string>
-    <string name="accessibility_color_inversion_qs_tooltip_content" msgid="5046332142185711869">"You can also add colour inversion to Quick Settings from the top of your screen"</string>
-    <string name="accessibility_reduce_bright_colors_auto_added_qs_tooltip_content" msgid="1906588335786328512">"Extra dim added to Quick Settings. Swipe down to turn it on or off at any time."</string>
+    <string name="accessibility_color_correction_auto_added_qs_tooltip_content" msgid="9092661358437404374">"Color correction added to Quick Settings. Swipe down to turn it on or off anytime."</string>
+    <string name="accessibility_color_correction_qs_tooltip_content" msgid="3258628434235475205">"You can also add color correction to Quick Settings from the top of your screen"</string>
+    <string name="accessibility_color_inversion_auto_added_qs_tooltip_content" msgid="7267618234972101725">"Color inversion added to Quick Settings. Swipe down to turn it on or off anytime."</string>
+    <string name="accessibility_color_inversion_qs_tooltip_content" msgid="5046332142185711869">"You can also add color inversion to Quick Settings from the top of your screen"</string>
+    <string name="accessibility_reduce_bright_colors_auto_added_qs_tooltip_content" msgid="1906588335786328512">"Extra dim added to Quick Settings. Swipe down to turn it on or off anytime."</string>
     <string name="accessibility_reduce_bright_colors_qs_tooltip_content" msgid="7522121299176176785">"You can also add extra dim to Quick Settings from the top of your screen"</string>
-    <string name="accessibility_one_handed_mode_auto_added_qs_tooltip_content" msgid="7914554254280416532">"One-handed mode added to Quick Settings. Swipe down to turn it on or off at any time."</string>
+    <string name="accessibility_one_handed_mode_auto_added_qs_tooltip_content" msgid="7914554254280416532">"One-handed mode added to Quick Settings. Swipe down to turn it on or off anytime."</string>
     <string name="accessibility_one_handed_mode_qs_tooltip_content" msgid="2754332083184384603">"You can also add one-handed mode to Quick Settings from the top of your screen"</string>
     <string name="accessibility_quick_settings_tooltip_dismiss" msgid="3269120277643884190">"Dismiss"</string>
-    <string name="accessibility_daltonizer_about_intro_text" product="default" msgid="3636710237139542212">"Adjust how colours display on your phone"</string>
-    <string name="accessibility_daltonizer_about_intro_text" product="tablet" msgid="3702653229533336133">"Adjust how colours display on your tablet"</string>
-    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
-    <string name="accessibility_daltonizer_shortcut_title" msgid="7480360363995502369">"Colour correction shortcut"</string>
-    <string name="accessibility_daltonizer_about_title" msgid="6063650804116981287">"About colour correction"</string>
-    <string name="accessibility_daltonizer_footer_learn_more_content_description" msgid="2091679253892040910">"Learn more about colour correction"</string>
-    <string name="accessibility_color_inversion_about_title" msgid="8275754480247040136">"About colour inversion"</string>
-    <string name="accessibility_color_inversion_footer_learn_more_content_description" msgid="5382579548498952445">"Learn more about colour inversion"</string>
+    <string name="accessibility_daltonizer_about_intro_text" product="default" msgid="3636710237139542212">"Adjust how colors display on your phone"</string>
+    <string name="accessibility_daltonizer_about_intro_text" product="tablet" msgid="3702653229533336133">"Adjust how colors display on your tablet"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use color correction"</string>
+    <string name="accessibility_daltonizer_shortcut_title" msgid="7480360363995502369">"Color correction shortcut"</string>
+    <string name="accessibility_daltonizer_about_title" msgid="6063650804116981287">"About color correction"</string>
+    <string name="accessibility_daltonizer_footer_learn_more_content_description" msgid="2091679253892040910">"Learn more about color correction"</string>
+    <string name="accessibility_color_inversion_about_title" msgid="8275754480247040136">"About color inversion"</string>
+    <string name="accessibility_color_inversion_footer_learn_more_content_description" msgid="5382579548498952445">"Learn more about color inversion"</string>
     <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
     <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
-    <string name="accessibility_caption_preference_intro" msgid="6662649135457507767">"Customise caption size and style to make them easier to read"</string>
+    <string name="accessibility_caption_preference_intro" msgid="6662649135457507767">"Customize caption size and style to make them easier to read"</string>
     <string name="accessibility_caption_preference_summary" msgid="632875702223135121">"These caption preferences aren’t supported by all media apps"</string>
     <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"Accessibility button"</string>
     <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"2-finger swipe up from bottom"</string>
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Hold volume keys"</string>
-    <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Triple-tap screen"</string>
+    <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Triple tap screen"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Continue"</string>
     <string name="accessibility_hearingaid_title" msgid="427173678199203191">"Hearing aids"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"No hearing aids connected"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Add hearing aids"</string>
     <string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"Pair hearing aids"</string>
-    <string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"On the next screen, tap on your hearing aids. You may need to pair the left and right ears separately.\n\nMake sure that your hearing aids are turned on and ready to pair."</string>
+    <string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"On the next screen, tap on your hearing aids. You may need to pair the left and right ears separately.\n\nMake sure your hearing aids are turned on and ready to pair."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> active"</string>
     <string name="accessibility_hearingaid_left_side_device_summary" msgid="1907302799168261001">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, left only"</string>
     <string name="accessibility_hearingaid_right_side_device_summary" msgid="148257064855054376">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, right only"</string>
@@ -2620,7 +2619,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="4210949400493358650">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6392456967103014723">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="2278786218762602022">"Blue-yellow"</string>
-    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Greyscale"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="2117727423019598455">"Green weak, deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="4617032854982040748">"Red weak, protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2428218320118180070">"Tritanomaly"</string>
@@ -2630,7 +2629,7 @@
     <string name="reduce_bright_colors_about_title" msgid="503655452544934393">"About extra dim"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="7878756844769221647">"Dim screen beyond your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="8959794720356934888">"Dim screen beyond your tablet’s minimum brightness"</string>
-    <string name="reduce_bright_colors_preference_intro_text" msgid="3502290826747650566">"Make your screen dimmer so that it’s more comfortable to read"</string>
+    <string name="reduce_bright_colors_preference_intro_text" msgid="3502290826747650566">"Make your screen dimmer so it’s more comfortable to read"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="8573408446901659333">"Extra dim can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5158211121482010799">"Extra dim can be helpful when: &lt;ol&gt; &lt;li&gt; Your tablet’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your tablet in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="reduce_bright_colors_intensity_preference_title" msgid="7455443033955118267">"Intensity"</string>
@@ -2661,24 +2660,24 @@
     <string name="captioning_locale" msgid="5533303294290661590">"Language"</string>
     <string name="captioning_text_size" msgid="8039448543171463017">"Text size"</string>
     <string name="captioning_preset" msgid="4174276086501638524">"Caption style"</string>
-    <string name="captioning_custom_options_title" msgid="3858866498893566351">"Customisation options"</string>
-    <string name="captioning_background_color" msgid="5231412761368883107">"Background colour"</string>
+    <string name="captioning_custom_options_title" msgid="3858866498893566351">"Custom options"</string>
+    <string name="captioning_background_color" msgid="5231412761368883107">"Background color"</string>
     <string name="captioning_background_opacity" msgid="6453738649182382614">"Background opacity"</string>
-    <string name="captioning_window_color" msgid="1406167274530183119">"Caption window colour"</string>
+    <string name="captioning_window_color" msgid="1406167274530183119">"Caption window color"</string>
     <string name="captioning_window_opacity" msgid="4031752812991199525">"Caption window opacity"</string>
-    <string name="captioning_foreground_color" msgid="9057327228286129232">"Text colour"</string>
+    <string name="captioning_foreground_color" msgid="9057327228286129232">"Text color"</string>
     <string name="captioning_foreground_opacity" msgid="1395843080697567189">"Text opacity"</string>
-    <string name="captioning_edge_color" msgid="6035818279902597518">"Edge colour"</string>
+    <string name="captioning_edge_color" msgid="6035818279902597518">"Edge color"</string>
     <string name="captioning_edge_type" msgid="5281259280060811506">"Edge type"</string>
     <string name="captioning_typeface" msgid="285325623518361407">"Font family"</string>
     <string name="captioning_preview_text" msgid="4973475065545995704">"Captions will look like this"</string>
     <string name="captioning_preview_characters" msgid="7854812443613580460">"Aa"</string>
     <string name="locale_default" msgid="8948077172250925164">"Default"</string>
-    <string name="color_title" msgid="2511586788643787427">"Colour"</string>
+    <string name="color_title" msgid="2511586788643787427">"Color"</string>
     <string name="color_unspecified" msgid="4102176222255378320">"Default"</string>
     <string name="color_none" msgid="3703632796520710651">"None"</string>
     <string name="color_white" msgid="1896703263492828323">"White"</string>
-    <string name="color_gray" msgid="8554077329905747877">"Grey"</string>
+    <string name="color_gray" msgid="8554077329905747877">"Gray"</string>
     <string name="color_black" msgid="9006830401670410387">"Black"</string>
     <string name="color_red" msgid="5210756997426500693">"Red"</string>
     <string name="color_green" msgid="4400462091250882271">"Green"</string>
@@ -2707,7 +2706,7 @@
     <string name="settings_button" msgid="2195468788019730377">"Settings"</string>
     <string name="keywords_reduce_bright_colors" msgid="1683190961013139183">"light sensitivity, photophobia, dark theme, migraine, headache, reading mode, night mode, reduce brightness, white point"</string>
     <string name="keywords_accessibility" msgid="4263443239404659143">"Ease of use, ease of access, assistance, assistive"</string>
-    <string name="keywords_magnification" msgid="3908145308269840862">"Window magnifier, zoom, magnification, low vision, enlarge, make bigger"</string>
+    <string name="keywords_magnification" msgid="3908145308269840862">"Window Magnifier, Zoom, Magnification, Low vision, Enlarge, make bigger"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
     <string name="keywords_live_caption" msgid="1667203998080567556">"Captions, closed captions, CC, Live Transcribe, hard of hearing, hearing loss, CART, speech to text, subtitle"</string>
     <string name="keywords_live_transcribe" msgid="3226990195174890997"></string>
@@ -2716,13 +2715,13 @@
     <string name="keywords_display_size" msgid="5286419615221231518">"screen size, large screen"</string>
     <string name="keywords_bold_text" msgid="6257418169207099589">"High contrast, low vision, bold font, bold face"</string>
     <string name="keywords_select_to_speak" msgid="2872704811610888719"></string>
-    <string name="keywords_color_correction" msgid="8540442886990423681">"adjust colour"</string>
+    <string name="keywords_color_correction" msgid="8540442886990423681">"adjust color"</string>
     <string name="keywords_color_inversion" msgid="4291058365873221962">"turn screen dark, turn screen light"</string>
     <string name="keywords_accessibility_menu" msgid="4300579436464706608"></string>
     <string name="keywords_switch_access" msgid="5813094504384313402"></string>
     <string name="keywords_auto_click" msgid="7151756353013736931">"motor, mouse"</string>
     <string name="keywords_hearing_aids" msgid="524979615168196199">"hard of hearing, hearing loss"</string>
-    <string name="keywords_rtt" msgid="2429130928152514402">"hard of hearing, hearing loss, captions, Teletype, TTY"</string>
+    <string name="keywords_rtt" msgid="2429130928152514402">"hard of hearing, hearing loss, captions, Teletype, tty"</string>
     <string name="keywords_voice_access" msgid="7807335263195876454"></string>
     <string name="print_settings" msgid="8519810615863882491">"Printing"</string>
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Off"</string>
@@ -2761,7 +2760,7 @@
     <string name="printer_info_desc" msgid="1206872325746154206">"More information about this printer"</string>
     <string name="power_usage_summary_title" msgid="4198312848584882113">"Battery"</string>
     <string name="power_usage_summary" msgid="6857382582534984531">"What has been using the battery"</string>
-    <string name="power_usage_not_available" msgid="3425302437465106036">"Battery usage data isn\'t available."</string>
+    <string name="power_usage_not_available" msgid="3425302437465106036">"Battery usage data isn’t available."</string>
     <string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> remaining"</string>
     <string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
@@ -2774,15 +2773,15 @@
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimize battery, you can\'t restrict it.\n\nTo restrict the app, first turn on battery optimization."</string>
     <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Unrestricted"</string>
-    <string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimised"</string>
+    <string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimized"</string>
     <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restricted"</string>
     <string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"Allow battery usage in background without restrictions. May use more battery."</string>
-    <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"Optimise based on your usage. Recommended for most apps."</string>
+    <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"Optimize based on your usage. Recommended for most apps."</string>
     <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"Restrict battery usage while in background. App may not work as expected. Notifications may be delayed."</string>
     <string name="manager_battery_usage_footer" msgid="2635906573922553766">"Changing how an app uses your battery can affect its performance."</string>
     <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"This app requires <xliff:g id="STATE">%1$s</xliff:g> battery usage."</string>
     <string name="manager_battery_usage_unrestricted_only" msgid="3646162131339418216">"unrestricted"</string>
-    <string name="manager_battery_usage_optimized_only" msgid="7121785281913056432">"optimised"</string>
+    <string name="manager_battery_usage_optimized_only" msgid="7121785281913056432">"optimized"</string>
     <string name="manager_battery_usage_link_a11y" msgid="374918091821438564">"Learn more about battery usage options"</string>
     <string name="device_screen_usage" msgid="1011630249648289909">"Screen usage since full charge"</string>
     <string name="power_usage_list_summary" msgid="3237540201918492925">"Battery usage since full charge"</string>
@@ -2793,7 +2792,7 @@
     <string name="battery_stats_on_battery" msgid="1553011980384645514">"<xliff:g id="TIME">%1$s</xliff:g> on battery"</string>
     <string name="battery_stats_duration" msgid="6918768703070999743">"<xliff:g id="TIME">%1$s</xliff:g> since unplugged"</string>
     <string name="battery_stats_charging_label" msgid="6204814386861342145">"Charging"</string>
-    <string name="battery_stats_screen_on_label" msgid="8989312180491200138">"Screen ON"</string>
+    <string name="battery_stats_screen_on_label" msgid="8989312180491200138">"Screen on"</string>
     <string name="battery_stats_gps_on_label" msgid="5626424078405382686">"GPS on"</string>
     <string name="battery_stats_camera_on_label" msgid="555635201416769359">"Camera on"</string>
     <string name="battery_stats_flashlight_on_label" msgid="1621027969559427783">"Flashlight on"</string>
@@ -2809,7 +2808,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"History details"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Battery usage"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"View usage for past 24 hours"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"View usage from last full charge"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"View usage since last full charge"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"App battery usage"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -2825,7 +2824,7 @@
     <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Turn on Battery Saver"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Battery may run out earlier than usual"</string>
     <string name="battery_tip_early_heads_up_done_title" msgid="7705597228709143337">"Battery Saver on"</string>
-    <string name="battery_saver_link_a11y" msgid="740558184830458845">"Learn more about Battery Saver"</string>
+    <string name="battery_saver_link_a11y" msgid="740558184830458845">"Learn more about Battery saver"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Some features may be limited"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Higher battery usage"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"See apps with highest usage"</string>
@@ -2871,8 +2870,8 @@
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Cancel"</string>
     <string name="battery_tip_charge_to_full_button" msgid="6701709034348116261">"Charge to full"</string>
     <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\'re running low on battery."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions that you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions you can take.\n\nYou can always turn on Battery Saver if you’re running low on battery."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"Manage apps automatically"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Limit battery for apps you don\'t use often"</string>
@@ -2896,7 +2895,7 @@
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="battery_missing_message" msgid="400958471814422770">"Problem reading the battery meter."</string>
     <string name="battery_missing_link_message" msgid="6021565067124898074"></string>
-    <string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"Tap to find out more about this error"</string>
+    <string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"Tap to learn more about this error"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stop app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2956,21 +2955,21 @@
     <string name="battery_desc_voice" msgid="6900799826084022585">"Battery used by voice calls"</string>
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"Battery used when tablet is idle"</string>
     <string name="battery_desc_standby" product="default" msgid="2543075041964578103">"Battery used when phone is idle"</string>
-    <string name="battery_desc_radio" msgid="454677140485133914">"Battery used by mobile radio"</string>
+    <string name="battery_desc_radio" msgid="454677140485133914">"Battery used by cell radio"</string>
     <string name="battery_sugg_radio" msgid="5476234634503535270">"Switch to Airplane mode to save power in areas with no cell coverage"</string>
     <string name="battery_desc_flashlight" msgid="6694895513133361404">"Battery used by the flashlight"</string>
     <string name="battery_desc_camera" msgid="6152712271731518018">"Battery used by the camera"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"Battery used by the display and backlight"</string>
     <string name="battery_sugg_display" msgid="3102137296547788111">"Reduce the screen brightness and/or screen timeout"</string>
     <string name="battery_desc_wifi" msgid="5276669172548928768">"Battery used by Wi‑Fi"</string>
-    <string name="battery_sugg_wifi" msgid="359757575108350109">"Turn off Wi‑Fi when not using it or when it isn\'t available"</string>
+    <string name="battery_sugg_wifi" msgid="359757575108350109">"Turn off Wi‑Fi when not using it or when it isn’t available"</string>
     <string name="battery_desc_bluetooth" msgid="2237947137783306282">"Battery used by Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="8943564578546832037">"Turn off Bluetooth when you aren\'t using it"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="8943564578546832037">"Turn off Bluetooth when you aren’t using it"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Try connecting to a different Bluetooth device"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"Battery used by app"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"Stop or uninstall the app"</string>
     <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Select battery-saving mode"</string>
-    <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"The application may offer settings to reduce battery use"</string>
+    <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"The app may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Battery used by user"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"Miscellaneous power use"</string>
     <string name="battery_msg_unaccounted" msgid="5647345548624995064">"Battery use is an approximation of power use and does not include every source of battery drain. Miscellaneous is the difference between the computed approximate power use and the actual drain observed on the battery."</string>
@@ -2990,25 +2989,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Battery usage"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Since full charge"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Manage battery usage"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfrom last full charge"</string>
-    <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor past 24 hours"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nsince last full charge"</string>
+    <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor past 24 hr"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total less than a minute from last full charge"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total less than a minute since last full charge"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total less than a minute for past 24 hr"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Background less than a minute from last full charge"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Background less than a minute since last full charge"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Background less than a minute for past 24 hr"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Background less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> total from last full charge"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> total since last full charge"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> total for past 24 hr"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> total for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> background from last full charge"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> background since last full charge"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> background for past 24 hr"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> background for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfrom last full charge"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfor past 24 hours"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nsince last full charge"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfor past 24 hr"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> total • background less than a minute\nfor <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"No usage from last full charge"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"No usage since last full charge"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"No usage for past 24 hr"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Other users"</string>
@@ -3017,11 +3016,11 @@
     <string name="estimated_charging_time_left" msgid="2287135413363961246">"Until fully charged"</string>
     <string name="estimated_time_description" msgid="211058785418596009">"Estimate may change based on usage"</string>
     <string name="menu_stats_unplugged" msgid="7125297366200634285">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
-    <string name="menu_stats_last_unplugged" msgid="230678127178268655">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_last_unplugged" msgid="230678127178268655">"While last unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="2713445396954503670">"Usage totals"</string>
     <string name="menu_stats_refresh" msgid="6727628139586938835">"Refresh"</string>
-    <string name="process_mediaserver_label" msgid="6135260215912215092">"Media server"</string>
-    <string name="process_dex2oat_label" msgid="1190208677726583153">"App optimisation"</string>
+    <string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
+    <string name="process_dex2oat_label" msgid="1190208677726583153">"App optimization"</string>
     <string name="process_network_tethering" msgid="6822671758152900766">"Tethering"</string>
     <string name="process_removed_apps" msgid="6544406592678476902">"Removed apps"</string>
     <string name="battery_saver" msgid="7737147344510595864">"Battery Saver"</string>
@@ -3048,15 +3047,15 @@
     <string name="battery_percentage" msgid="1779934245963043490">"Battery percentage"</string>
     <string name="battery_percentage_description" msgid="2321465139126125541">"Show battery percentage in status bar"</string>
     <string name="battery_usage_chart_graph_hint_last_full_charge" msgid="6570336408060566877">"Battery level since last full charge"</string>
-    <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Battery level for the past 24 hours"</string>
+    <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Battery level for past 24 hr"</string>
     <string name="battery_app_usage" msgid="8976453608783133770">"App usage since last full charge"</string>
-    <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"App usage for the past 24 hours"</string>
+    <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"App usage for past 24 hr"</string>
     <string name="battery_system_usage" msgid="1395943945140097585">"System usage since last full charge"</string>
-    <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"System usage for past 24 hours"</string>
+    <string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"System usage for past 24 hr"</string>
     <string name="battery_system_usage_for" msgid="3248552137819897140">"System usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
     <string name="battery_app_usage_for" msgid="7309909074935858949">"App usage for <xliff:g id="SLOT">%s</xliff:g>"</string>
-    <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
-    <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min."</string>
+    <string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min"</string>
+    <string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min"</string>
     <string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="battery_usage_for_background_time" msgid="9109637210617095188">"Background: <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="battery_usage_screen_footer" product="default" msgid="7899907241146636817">"Battery usage data is approximate and doesn\'t measure usage when phone is charging"</string>
@@ -3081,7 +3080,7 @@
     <string name="process_stats_os_cache" msgid="4753163023524305711">"Caches"</string>
     <string name="process_stats_ram_use" msgid="5966645638783509937">"RAM use"</string>
     <string name="process_stats_bg_ram_use" msgid="3572439697306771461">"RAM use (background)"</string>
-    <string name="process_stats_run_time" msgid="8631920944819076418">"Running time"</string>
+    <string name="process_stats_run_time" msgid="8631920944819076418">"Run time"</string>
     <string name="processes_subtitle" msgid="5791138718719605724">"Processes"</string>
     <string name="services_subtitle" msgid="9136741140730524046">"Services"</string>
     <string name="menu_proc_stats_duration" msgid="1249684566371309908">"Duration"</string>
@@ -3107,7 +3106,7 @@
     <string name="voice_service_preference_section_title" msgid="4807795449147187497">"Voice input services"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"Full hotword and interaction"</string>
     <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Simple speech to text"</string>
-    <string name="voice_interaction_security_warning" msgid="7962884055885987671">"This voice input service will be able to perform always-on voice monitoring, and control voice enabled applications on your behalf. It comes from the <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> application. Enable the use of this service?"</string>
+    <string name="voice_interaction_security_warning" msgid="7962884055885987671">"This voice input service will be able to perform always-on voice monitoring and control voice enabled applications on your behalf. It comes from the <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> application. Enable the use of this service?"</string>
     <string name="on_device_recognition_settings" msgid="6503160369314598069">"On-device recognition settings"</string>
     <string name="on_device_recognition_settings_title" msgid="7137599722039096545">"On-device recognition"</string>
     <string name="on_device_recognition_settings_summary" msgid="3292736423223499348">"On-device speech recognition"</string>
@@ -3146,20 +3145,20 @@
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"Remove all the contents?"</string>
-    <string name="credentials_erased" msgid="9121052044566053345">"Credential storage has been erased."</string>
-    <string name="credentials_not_erased" msgid="3611058412683184031">"Credential storage couldn\'t be erased."</string>
+    <string name="credentials_erased" msgid="9121052044566053345">"Credential storage is erased."</string>
+    <string name="credentials_not_erased" msgid="3611058412683184031">"Credential storage couldn’t be erased."</string>
     <string name="usage_access_title" msgid="1580006124578134850">"Apps with usage access"</string>
     <string name="ca_certificate" msgid="3076484307693855611">"CA certificate"</string>
-    <string name="user_certificate" msgid="6897024598058566466">"VPN and app user certificate"</string>
+    <string name="user_certificate" msgid="6897024598058566466">"VPN &amp; app user certificate"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"Wi‑Fi certificate"</string>
     <string name="ca_certificate_warning_title" msgid="7951148441028692619">"Your data won’t be private"</string>
-    <string name="ca_certificate_warning_description" msgid="8409850109551028774">"CA certificates are used by websites, apps and VPNs for encryption. Only install CA certificates from organisations that you trust. \n\nIf you install a CA certificate, the certificate owner could access your data, such as passwords or credit card details, from websites that you visit or apps that you use – even if your data is encrypted."</string>
+    <string name="ca_certificate_warning_description" msgid="8409850109551028774">"CA certificates are used by websites, apps, and VPNs for encryption. Only install CA certificates from organizations you trust. \n\nIf you install a CA certificate, the certificate owner could access your data, such as passwords or credit card details, from websites you visit or apps you use – even if your data is encrypted."</string>
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Don’t install"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Install anyway"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificate not installed"</string>
     <string name="request_manage_credentials_title" msgid="596805634568013413">"Allow "<b>"<xliff:g id="APP_NAME">^1</xliff:g>"</b>" to install certificates on this device?"</string>
     <string name="request_manage_credentials_description" msgid="8044839857171509619">"These certificates will verify you by sharing your device’s unique ID with the apps and URLs below"</string>
-    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Don\'t allow"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Don’t allow"</string>
     <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Allow"</string>
     <string name="request_manage_credentials_more" msgid="6101210283534101582">"Show more"</string>
     <string name="certificate_management_app" msgid="8086699498358080826">"Certificate management app"</string>
@@ -3173,26 +3172,26 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> URLs</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> URL</item>
     </plurals>
-    <string name="emergency_tone_title" msgid="6673118505206685168">"Emergency dialling signal"</string>
-    <string name="emergency_tone_summary" msgid="2519776254708767388">"Set behaviour when an emergency call is placed"</string>
+    <string name="emergency_tone_title" msgid="6673118505206685168">"Emergency dialing signal"</string>
+    <string name="emergency_tone_summary" msgid="2519776254708767388">"Set behavior when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
     <string name="backup_summary_state_on" msgid="9018954639693085240">"On"</string>
     <string name="backup_summary_state_off" msgid="5341339397224835909">"Off"</string>
     <string name="backup_section_title" msgid="6539706829848457794">"Backup &amp; restore"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Personal data"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Back up my data"</string>
-    <string name="backup_data_summary" msgid="8054551085241427531">"Back up app data, Wi‑Fi passwords and other settings to Google servers"</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"Back up app data, Wi‑Fi passwords, and other settings to Google servers"</string>
     <string name="backup_configure_account_title" msgid="8574055186903658842">"Backup account"</string>
     <string name="backup_data_management_title" msgid="6596830198441939702">"Manage backup account"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Include app data"</string>
     <string name="auto_restore_title" msgid="4124345897936637561">"Automatic restore"</string>
-    <string name="auto_restore_summary" msgid="6830198851045584001">"When reinstalling an app, restore backed-up settings and data"</string>
+    <string name="auto_restore_summary" msgid="6830198851045584001">"When reinstalling an app, restore backed up settings and data"</string>
     <string name="backup_inactive_title" msgid="6753265378043349277">"Backup service isn\'t active"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"No account is currently storing backed up data"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Stop backing up your Wi‑Fi passwords, bookmarks, other settings and app data, plus erase all copies on Google servers?"</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Stop backing up your Wi‑Fi passwords, bookmarks, other settings, and app data, plus erase all copies on Google servers?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Stop backing up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps), plus erase all copies on remote servers?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages and photos."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages, and photos."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Device admin settings"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Device admin app"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Deactivate this device admin app"</string>
@@ -3204,12 +3203,12 @@
     <string name="add_device_admin_msg" msgid="7730006568970042119">"Activate device admin app?"</string>
     <string name="add_device_admin" msgid="6252128813507932519">"Activate this device admin app"</string>
     <string name="device_admin_add_title" msgid="6087481040932322289">"Device admin"</string>
-    <string name="device_admin_warning" msgid="1889160106787280321">"Activating this admin app will allow the <xliff:g id="APP_NAME">%1$s</xliff:g> app to perform the following operations:"</string>
+    <string name="device_admin_warning" msgid="1889160106787280321">"Activating this admin app will allow the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
     <string name="device_admin_warning_simplified" msgid="2715756519899116115">"This device will be managed and monitored by <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
-    <string name="device_admin_status" msgid="6332571781623084064">"This admin app is active and allows the <xliff:g id="APP_NAME">%1$s</xliff:g> app to perform the following operations:"</string>
+    <string name="device_admin_status" msgid="6332571781623084064">"This admin app is active and allows the app <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"Activate Profile Manager?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"Allow supervision?"</string>
-    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"By proceeding, your user will be managed by your admin, which may also be able to store associated data, in addition to your personal data.\n\nYour admin has the ability to monitor and manage settings, access, apps and data associated with this user, including network activity and your device\'s location information."</string>
+    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"By proceeding, your user will be managed by your admin which may also be able to store associated data, in addition to your personal data.\n\nYour admin has the ability to monitor and manage settings, access, apps, and data associated with this user, including network activity and your device\'s location information."</string>
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"Other options are disabled by your admin"</string>
     <string name="admin_more_details" msgid="4928985331640193758">"Learn more"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"Notification log"</string>
@@ -3226,19 +3225,19 @@
     <string name="accessibility_sync_enabled" msgid="5308864640407050209">"Sync enabled"</string>
     <string name="accessibility_sync_disabled" msgid="5507600126380593611">"Sync disabled"</string>
     <string name="accessibility_sync_in_progress" msgid="3229428197779196660">"Syncing now"</string>
-    <string name="accessibility_sync_error" msgid="7248490045013170437">"Sync error..."</string>
+    <string name="accessibility_sync_error" msgid="7248490045013170437">"Sync error."</string>
     <string name="sync_failed" msgid="3806495232114684984">"Sync failed"</string>
     <string name="sync_active" msgid="5787407579281739975">"Sync active"</string>
     <string name="account_sync_settings_title" msgid="2684888109902800966">"Sync"</string>
     <string name="sync_is_failing" msgid="6738004111400633331">"Sync is currently experiencing problems. It will be back shortly."</string>
     <string name="add_account_label" msgid="7134707140831385869">"Add account"</string>
-    <string name="managed_profile_not_available_label" msgid="7500578232182547365">"Work profile isn\'t available yet"</string>
+    <string name="managed_profile_not_available_label" msgid="7500578232182547365">"Work profile isn’t available yet"</string>
     <string name="work_mode_label" msgid="1001415270126064436">"Work profile"</string>
     <string name="work_mode_on_summary" msgid="2042885311126239961">"Managed by your organization"</string>
     <string name="work_mode_off_summary" msgid="4044568753909036134">"Apps and notifications are off"</string>
     <string name="remove_managed_profile_label" msgid="1294933737673830431">"Remove work profile"</string>
     <string name="background_data" msgid="321903213000101158">"Background data"</string>
-    <string name="background_data_summary" msgid="6572245922513522466">"Apps can sync, send and receive data at any time"</string>
+    <string name="background_data_summary" msgid="6572245922513522466">"Apps can sync, send, and receive data at any time"</string>
     <string name="background_data_dialog_title" msgid="1692005302993229867">"Disable background data?"</string>
     <string name="background_data_dialog_message" msgid="7760280837612824670">"Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection."</string>
     <string name="sync_automatically" msgid="4874122892765430304">"Auto-sync app data"</string>
@@ -3256,27 +3255,27 @@
     <string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
     <string name="sync_calendar" msgid="4603704438090387251">"Calendar"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"Contacts"</string>
-    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
+    <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are."</string>
     <string name="header_application_sync_settings" msgid="7427706834875419243">"App sync settings"</string>
-    <string name="header_data_and_synchronization" msgid="453920312552838939">"Data &amp; synchronisation"</string>
+    <string name="header_data_and_synchronization" msgid="453920312552838939">"Data &amp; synchronization"</string>
     <string name="preference_change_password_title" msgid="5465821666939825972">"Change password"</string>
     <string name="header_account_settings" msgid="1189339410278750008">"Account settings"</string>
     <string name="remove_account_label" msgid="4169490568375358010">"Remove account"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"Add an account"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"Remove account?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Removing this account will delete all of its messages, contacts and other data from the phone."</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Removing this account will delete all of its messages, contacts, and other data from the tablet!"</string>
+    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Removing this account will delete all of its messages, contacts, and other data from the phone!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Removing this account will delete all of its messages, contacts, and other data from the device!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"This change isn\'t allowed by your admin"</string>
-    <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Cannot sync manually"</string>
-    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
+    <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Can’t manually sync"</string>
+    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync."</string>
     <string name="delete" msgid="8330605554706263775">"Delete"</string>
-    <string name="misc_files" msgid="6598066985800749585">"Misc. files"</string>
+    <string name="misc_files" msgid="6598066985800749585">"Misc files"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="7622766714974500289">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="7898929601615536401">"Select all"</string>
     <string name="data_usage_summary_title" msgid="394067070764360142">"Data usage"</string>
-    <string name="data_usage_app_summary_title" msgid="4933742247928064178">"Mobile data and Wi‑Fi"</string>
+    <string name="data_usage_app_summary_title" msgid="4933742247928064178">"Mobile data &amp; Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"Carrier data accounting may differ from your device."</string>
     <string name="data_usage_app" msgid="6367974637783240699">"App usage"</string>
     <string name="data_usage_app_info_label" msgid="3542220416056122841">"APP INFO"</string>
@@ -3331,10 +3330,10 @@
     <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"This feature may cause an app that depends on background data to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"Restricting background data is possible only when you’ve set a mobile data limit."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"Turn auto-sync data on?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Any changes that you make to your accounts on the web will be automatically copied to your tablet.\n\nSome accounts may also automatically copy any changes that you make on the tablet to the web. A Google Account works this way."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Any changes that you make to your accounts on the web will be automatically copied to your phone.\n\nSome accounts may also automatically copy any changes that you make on the phone to the web. A Google Account works this way."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"Any changes you make to your accounts on the web will be automatically copied to your tablet.\n\nSome accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"Any changes you make to your accounts on the web will be automatically copied to your phone.\n\nSome accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Turn auto-sync data off?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"This will conserve data and battery usage, but you\'ll need to sync each account manually to collect recent information and you won\'t receive notifications when updates occur."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"This will conserve data and battery usage, but you’ll need to sync each account manually to collect recent information. And you won’t receive notifications when updates occur."</string>
     <string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"Usage cycle reset date"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="1026234456777365545">"Date of each month:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="6110165528024717527">"Set"</string>
@@ -3371,7 +3370,7 @@
     <string name="vpn_mppe" msgid="7366657055055114239">"PPP encryption (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="2356744369959140121">"L2TP secret"</string>
     <string name="vpn_ipsec_identifier" msgid="8511842694369254801">"IPSec identifier"</string>
-    <string name="vpn_ipsec_secret" msgid="532007567355505963">"IPSec preshared key"</string>
+    <string name="vpn_ipsec_secret" msgid="532007567355505963">"IPSec pre-shared key"</string>
     <string name="vpn_ipsec_user_cert" msgid="2714372103705048405">"IPSec user certificate"</string>
     <string name="vpn_ipsec_ca_cert" msgid="5558498943577474987">"IPSec CA certificate"</string>
     <string name="vpn_ipsec_server_cert" msgid="1411390470454731396">"IPSec server certificate"</string>
@@ -3383,7 +3382,7 @@
     <string name="vpn_password" msgid="1183746907642628127">"Password"</string>
     <string name="vpn_save_login" msgid="5986762519977472618">"Save account information"</string>
     <string name="vpn_not_used" msgid="7229312881336083354">"(not used)"</string>
-    <string name="vpn_no_ca_cert" msgid="3687379414088677735">"(don\'t verify server)"</string>
+    <string name="vpn_no_ca_cert" msgid="3687379414088677735">"(don’t verify server)"</string>
     <string name="vpn_no_server_cert" msgid="8106540968643125407">"(received from server)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="4699113710248872972">"This VPN type can\'t stay connected at all times"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="2635347740046212693">"Always-on VPN only supports numeric server addresses"</string>
@@ -3404,9 +3403,9 @@
     <string name="vpn_forget_long" msgid="729132269203870205">"Forget VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Replace existing VPN?"</string>
     <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Set always-on VPN?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="2769478310633047870">"When this setting is on, you won\'t have an Internet connection until the VPN successfully connects"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="9154843462740876652">"Your existing VPN will be replaced and you won\'t have an Internet connection until the VPN successfully connects"</string>
-    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"You\'re already connected to an always-on VPN. If you connect to a different one, your existing VPN will be replaced and always-on mode will turn off."</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="2769478310633047870">"When this setting is on, you won\'t have an internet connection until the VPN successfully connects"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="9154843462740876652">"Your existing VPN will be replaced, and you won\'t have an internet connection until the VPN successfully connects"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"You\'re already connected to an always-on VPN. If you connect to a different one, your existing VPN will be replaced, and always-on mode will turn off."</string>
     <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"You\'re already connected to a VPN. If you connect to a different one, your existing VPN will be replaced."</string>
     <string name="vpn_turn_on" msgid="3568307071295211187">"Turn on"</string>
     <string name="vpn_cant_connect_title" msgid="5670787575925519386">"<xliff:g id="VPN_NAME">%1$s</xliff:g> can\'t connect"</string>
@@ -3462,33 +3461,33 @@
       <item quantity="other">Trust or remove certificates</item>
       <item quantity="one">Trust or remove certificate</item>
     </plurals>
-    <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps and secure websites.\n\nFor more information about this certificate, contact your admin.}other{{orgName} has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps and secure websites.\n\nFor more information about these certificates, contact your admin.}}"</string>
-    <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites.\n\nFor more information about this certificate, contact your admin.}other{{orgName} has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps and secure websites.\n\nFor more information about these certificates, contact your admin.}}"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"A third party is capable of monitoring your network activity, including emails, apps and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
+    <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about this certificate, contact your admin.}other{{orgName} has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.}}"</string>
+    <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about this certificate, contact your admin.}other{{orgName} has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.}}"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"A third party is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="other">Check certificates</item>
       <item quantity="one">Check certificate</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Multiple users"</string>
-    <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Share your device by adding new users. Each user has a personal space on your device for custom Home screens, accounts, apps, settings and more."</string>
-    <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"Share your tablet by adding new users. Each user has a personal space on your tablet for custom Home screens, accounts, apps, settings and more."</string>
-    <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"Share your phone by adding new users. Each user has a personal space on your phone for custom Home screens, accounts, apps, settings and more."</string>
+    <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Share your device by adding new users. Each user has a personal space on your device for custom Home screens, accounts, apps, settings, and more."</string>
+    <string name="user_settings_footer_text" product="tablet" msgid="3730074318510244552">"Share your tablet by adding new users. Each user has a personal space on your tablet for custom Home screens, accounts, apps, settings, and more."</string>
+    <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"Share your phone by adding new users. Each user has a personal space on your phone for custom Home screens, accounts, apps, settings, and more."</string>
     <string name="user_list_title" msgid="1387379079186123404">"Users &amp; profiles"</string>
     <string name="user_add_user_or_profile_menu" msgid="305851380425838287">"Add user or profile"</string>
     <string name="user_summary_restricted_profile" msgid="451650609582185813">"Restricted profile"</string>
     <string name="user_summary_not_set_up" msgid="4602868481732886115">"Not set up"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1658946988920104613">"Not set up - Restricted profile"</string>
-    <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up - Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_add_max_count" msgid="3328539978480663740">"You can’t add any more users. Remove a user to add a new one."</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
-    <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet’s owner can manage users."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone’s owner can manage users."</string>
     <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"Restricted profiles cannot add accounts"</string>
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lock screen settings"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Add users from lock screen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Switch to admin user when docked"</string>
+    <string name="switch_to_dock_user_when_docked" msgid="2324395443311905635">"Switch to admin user when docked"</string>
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Delete this user?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remove this profile?"</string>
@@ -3503,13 +3502,13 @@
     <string name="user_delete_button" msgid="3833498650182594653">"Delete"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"All apps and data in this session will be deleted."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Remove"</string>
-    <string name="guest_category_title" msgid="5562663588315329152">"Guest (you)"</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Guest (You)"</string>
     <string name="user_category_title" msgid="4368580529662699083">"Users"</string>
     <string name="other_user_category_title" msgid="7089976887307643217">"Other users"</string>
     <string name="remove_guest_on_exit" msgid="8202972371459611066">"Delete guest activity"</string>
     <string name="remove_guest_on_exit_summary" msgid="3969962695703280353">"Delete all guest apps and data when exiting guest mode"</string>
     <string name="remove_guest_on_exit_dialog_title" msgid="2310442892536079416">"Delete guest activity?"</string>
-    <string name="remove_guest_on_exit_dialog_message" msgid="8112409834021851883">"Apps and data from this guest session will be deleted now, and all future guest activity will be deleted each time that you exit guest mode"</string>
+    <string name="remove_guest_on_exit_dialog_message" msgid="8112409834021851883">"Apps and data from this guest session will be deleted now, and all future guest activity will be deleted each time you exit guest mode"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Turn on phone calls"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Turn on phone calls &amp; SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Delete user"</string>
@@ -3518,9 +3517,9 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"Turn on phone calls &amp; SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"Call and SMS history will be shared with this user."</string>
     <string name="emergency_info_title" msgid="8233682750953695582">"Emergency information"</string>
-    <string name="emergency_info_summary" msgid="8463622253016757697">"Info and contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_info_summary" msgid="8463622253016757697">"Info &amp; contacts for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="open_app_button" msgid="5025229765547191710">"Open <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="more_settings_button" msgid="8988612279031242411">"More settings"</string>
+    <string name="more_settings_button" msgid="8988612279031242411">"More Settings"</string>
     <string name="application_restrictions" msgid="276179173572729205">"Allow apps and content"</string>
     <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Applications with restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"Expand settings for application"</string>
@@ -3533,9 +3532,9 @@
     <string name="nfc_default_payment_workapp_confirmation_title" msgid="746921251872504687">"Set work app as default payment app?"</string>
     <string name="nfc_default_payment_workapp_confirmation_message_title" msgid="1533022606333010329">"To make a payment using a work app:"</string>
     <string name="nfc_default_payment_workapp_confirmation_message_1" msgid="2917430119080702912">"work profile must be turned on."</string>
-    <string name="nfc_default_payment_workapp_confirmation_message_2" msgid="8161184137833245628">"you’ll need to enter your work PIN, pattern or password if you have one."</string>
+    <string name="nfc_default_payment_workapp_confirmation_message_2" msgid="8161184137833245628">"you’ll need to enter your work PIN, pattern, or password if you have one."</string>
     <string name="nfc_payment_how_it_works" msgid="3658253265242662010">"How it works"</string>
-    <string name="nfc_payment_no_apps" msgid="6840001883471438798">"Pay with your phone in shops"</string>
+    <string name="nfc_payment_no_apps" msgid="6840001883471438798">"Pay with your phone in stores"</string>
     <string name="nfc_payment_default" msgid="3769788268378614608">"Payment default"</string>
     <string name="nfc_payment_default_not_set" msgid="6471905683119084622">"Not set"</string>
     <string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
@@ -3559,7 +3558,7 @@
     <string name="restriction_menu_reset" msgid="92859464456364092">"Remove restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"Change PIN"</string>
     <string name="help_label" msgid="2896538416436125883">"Help and feedback"</string>
-    <string name="support_summary" product="default" msgid="6137136608018134563">"Help articles, phone and chat"</string>
+    <string name="support_summary" product="default" msgid="6137136608018134563">"Help articles, phone &amp; chat"</string>
     <string name="support_summary" product="tablet" msgid="6681247727996378252">"Help articles, tablet &amp; chat"</string>
     <string name="support_summary" product="device" msgid="1690554254039752541">"Help articles, device &amp; chat"</string>
     <string name="user_account_title" msgid="6389636876210834864">"Account for content"</string>
@@ -3599,7 +3598,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"Preferred network type"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (recommended)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"MMS messages"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"Send and receive when mobile data is off"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"Send &amp; receive when mobile data is off"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Data during calls"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Allow this SIM to be used for mobile data only during calls"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"Work SIM"</string>
@@ -3647,7 +3646,7 @@
     <string name="sim_editor_title" msgid="918655391915256859">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="2424593350691002557">"Carrier"</string>
     <string name="sim_editor_number" msgid="3209002966895156006">"Number"</string>
-    <string name="sim_editor_color" msgid="9067029630083892961">"SIM colour"</string>
+    <string name="sim_editor_color" msgid="9067029630083892961">"SIM color"</string>
     <string name="sim_card_select_title" msgid="8146523005929848793">"Select SIM card"</string>
     <string name="color_orange" msgid="216547825489739010">"Orange"</string>
     <string name="color_purple" msgid="6603701972079904843">"Purple"</string>
@@ -3681,37 +3680,37 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="8424794257586524040">"Bluetooth, driving mode"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="7155882619333726331">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="1175254057213044560">"Bluetooth"</string>
-    <string name="connected_devices_dashboard_android_auto_summary" msgid="8179090809275818804">"Bluetooth, Android Auto, Driving mode, NFC"</string>
-    <string name="connected_devices_dashboard_android_auto_no_nfc_summary" msgid="2532811870469405527">"Bluetooth, Android Auto, Driving mode"</string>
+    <string name="connected_devices_dashboard_android_auto_summary" msgid="8179090809275818804">"Bluetooth, Android Auto, driving mode, NFC"</string>
+    <string name="connected_devices_dashboard_android_auto_no_nfc_summary" msgid="2532811870469405527">"Bluetooth, Android Auto, driving mode"</string>
     <string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth, Android Auto, NFC"</string>
     <string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"Bluetooth, Android Auto"</string>
     <string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"Unavailable because NFC is off"</string>
     <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"To use, first install a payment app"</string>
-    <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Apps and notifications"</string>
+    <string name="app_and_notification_dashboard_title" msgid="2861781687031832943">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Recent apps, default apps"</string>
     <string name="notification_settings_work_profile" msgid="6076211850526353975">"Notification access is not available for apps in the work profile."</string>
-    <string name="account_dashboard_title" msgid="8228773251948253914">"Passwords and accounts"</string>
-    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"Saved passwords, auto-fill, synced accounts"</string>
+    <string name="account_dashboard_title" msgid="8228773251948253914">"Passwords &amp; accounts"</string>
+    <string name="account_dashboard_default_summary" msgid="1730719656099599488">"Saved passwords, autofill, synced accounts"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"Default apps"</string>
     <string name="system_dashboard_summary" msgid="7400745270362833832">"Languages, gestures, time, backup"</string>
     <string name="search_results_title" msgid="3360639917793022533">"Settings"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"wifi, wi-fi, network connection, internet, wireless, data, wi fi"</string>
-    <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi notification, wi-fi notification"</string>
+    <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi notification, wifi notification"</string>
     <string name="keywords_wifi_data_usage" msgid="4718555409695862085">"data usage"</string>
     <string name="keywords_time_format" msgid="5384803098766166820">"Use 24-hour format"</string>
     <string name="keywords_storage_files" msgid="4509695858659705198">"Download"</string>
     <string name="keywords_app_default" msgid="8977706259156428770">"Open with"</string>
     <string name="keywords_applications_settings" msgid="999926810912037792">"Applications"</string>
-    <string name="keywords_time_zone" msgid="6402919157244589055">"time zone"</string>
-    <string name="keywords_draw_overlay" msgid="3170036145197260392">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
+    <string name="keywords_time_zone" msgid="6402919157244589055">"timezone"</string>
+    <string name="keywords_draw_overlay" msgid="3170036145197260392">"Chat head, system, alert, window, dialog, display, on top other apps, draw"</string>
     <string name="keywords_flashlight" msgid="2133079265697578183">"Flashlight, Light, Torch"</string>
     <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, toggle, control"</string>
     <string name="keywords_more_mobile_networks" msgid="5041272719326831744">"cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="4319184318421027136">"wi-fi, Wi-Fi, call, calling"</string>
+    <string name="keywords_wifi_calling" msgid="4319184318421027136">"wifi, wi-fi, call, calling"</string>
     <string name="keywords_display" msgid="874738809280751745">"screen, touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="850742707616318056">"dim screen, touchscreen, battery, bright"</string>
-    <string name="keywords_display_night_display" msgid="4711054330804250058">"dim screen, night, tint, night shift, brightness, screen colour, colour, color"</string>
-    <string name="keywords_display_wallpaper" msgid="8478137541939526564">"background, personalise, customise display"</string>
+    <string name="keywords_display_night_display" msgid="4711054330804250058">"dim screen, night, tint, night shift, brightness, screen color, colour, color"</string>
+    <string name="keywords_display_wallpaper" msgid="8478137541939526564">"background, personalize, customize display"</string>
     <string name="keywords_display_font_size" msgid="3593317215149813183">"text size"</string>
     <string name="keywords_display_cast_screen" msgid="2572331770299149370">"project, cast, Screen mirroring, Screen sharing, mirroring, share screen, screen casting"</string>
     <string name="keywords_storage" msgid="3004667910133021783">"space, disk, hard drive, device usage"</string>
@@ -3720,14 +3719,14 @@
     <string name="keywords_battery_saver" msgid="6289682844453234359">"battery saver, power saver, saver"</string>
     <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"adaptive preferences, adaptive battery"</string>
     <string name="keywords_spell_checker" msgid="5148906820603481657">"spelling, dictionary, spellcheck, auto-correct"</string>
-    <string name="keywords_voice_input" msgid="7534900094659358971">"recogniser, input, speech, speak, language, hands-free, hand free recognition, offensive word, audio history, Bluetooth headset"</string>
+    <string name="keywords_voice_input" msgid="7534900094659358971">"recognizer, input, speech, speak, language, hands-free, hand free, recognition, offensive, word, audio, history, bluetooth headset"</string>
     <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"rate, language, default, speak, speaking, tts, accessibility, screen reader, blind"</string>
     <string name="keywords_date_and_time" msgid="4402136313104901312">"clock, military"</string>
     <string name="keywords_network_reset" msgid="4075670452112218042">"reset, restore, factory"</string>
     <string name="keywords_factory_data_reset" msgid="4979623326958976773">"wipe, delete, restore, clear, remove, factory reset"</string>
     <string name="keywords_printing" msgid="3528250034669909466">"printer"</string>
     <string name="keywords_sounds" msgid="187191900698371911">"speaker beep, speaker, volume, mute, silence, audio, music, haptic, vibrator, vibrate"</string>
-    <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"don\'t disturb, interrupt, interruption, break"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"dont don’t disturb, interrupt, interruption, break"</string>
     <string name="keywords_app" msgid="7983814237980258061">"RAM"</string>
     <string name="keywords_location" msgid="8016374808099706213">"nearby, location, history, reporting, GPS"</string>
     <string name="keywords_accounts" msgid="3013897982630845506">"account, add an account, work profile, add account, remove, delete"</string>
@@ -3737,10 +3736,10 @@
     <string name="keywords_all_apps" msgid="9016323378609007166">"apps, download, applications, system"</string>
     <string name="keywords_app_permissions" msgid="2061773665663541610">"apps, permissions, security"</string>
     <string name="keywords_default_apps" msgid="4601664230800605416">"apps, default"</string>
-    <string name="keywords_ignore_optimizations" msgid="8967142288569785145">"ignore optimisations, doze, app standby"</string>
-    <string name="keywords_color_mode" msgid="1193896024705705826">"vibrant, RGB, sRGB, colour, natural, standard"</string>
+    <string name="keywords_ignore_optimizations" msgid="8967142288569785145">"ignore optimizations, doze, app standby"</string>
+    <string name="keywords_color_mode" msgid="1193896024705705826">"vibrant, RGB, sRGB, color, natural, standard"</string>
     <string name="keywords_screen_resolution" msgid="6652125115386722875">"FHD, QHD, resolution, 1080p, 1440p"</string>
-    <string name="keywords_color_temperature" msgid="8159539138837118453">"colour, temperature, D65, D73, white, yellow, blue, warm, cool"</string>
+    <string name="keywords_color_temperature" msgid="8159539138837118453">"color, temperature, D65, D73, white, yellow, blue, warm, cool"</string>
     <string name="keywords_lockscreen" msgid="3656926961043485797">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_app_pinning" msgid="1564144561464945019">"screen pinning"</string>
     <string name="keywords_profile_challenge" msgid="5135555521652143612">"work challenge, work, profile"</string>
@@ -3772,8 +3771,8 @@
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"screen, lock time, timeout, lockscreen"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"memory, cache, data, delete, clear, free, space"</string>
     <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media"</string>
-    <string name="keywords_wallpaper" msgid="7332890404629446192">"background, theme, grid, customise, personalise"</string>
-    <string name="keywords_styles" msgid="5291614313348476068">"icon, accent, colour"</string>
+    <string name="keywords_wallpaper" msgid="7332890404629446192">"background, theme, grid, customize, personalize"</string>
+    <string name="keywords_styles" msgid="5291614313348476068">"icon, accent, color"</string>
     <string name="keywords_assist_input" msgid="3086289530227075593">"default, assistant"</string>
     <string name="keywords_default_payment_app" msgid="5162298193637362104">"payment, default"</string>
     <string name="keywords_ambient_display" msgid="3149287105145443697">"incoming notification"</string>
@@ -3787,23 +3786,23 @@
     <string name="keywords_media_vibration" msgid="723896490102792327">"haptics, vibrate, sensitivity, media"</string>
     <string name="keywords_vibration" msgid="670455132028025952">"haptics, vibrate, vibration"</string>
     <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"battery saver, sticky, persist, power saver, battery"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
-    <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, percent"</string>
+    <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, advanced calling, 4g calling"</string>
     <string name="keywords_nr_advanced_calling" msgid="4157823099610141014">"vo5g, vonr, advanced calling, 5g calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
     <string name="keywords_font_size" msgid="1643198841815006447">"text size, large print, large font, large text, low vision, make text bigger, font enlarger, font enlargement"</string>
-    <string name="keywords_always_show_time_info" msgid="9120590185763264666">"always-on display"</string>
+    <string name="keywords_always_show_time_info" msgid="9120590185763264666">"always on display"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
-    <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary" msgid="944761906531715109">"Ring &amp; notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="7192223433295988890">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="746662794579344761">"Ringer set to silent"</string>
-    <string name="sound_settings_example_summary" msgid="8125110691864707925">"Ring and notification volume at 80%"</string>
+    <string name="sound_settings_example_summary" msgid="8125110691864707925">"Ring &amp; notification volume at 80%"</string>
     <string name="media_volume_option_title" msgid="5966569685119475630">"Media volume"</string>
     <string name="remote_media_volume_option_title" msgid="8760846743943305764">"Cast volume"</string>
     <string name="call_volume_option_title" msgid="1461105986437268924">"Call volume"</string>
     <string name="alarm_volume_option_title" msgid="6398641749273697140">"Alarm volume"</string>
-    <string name="ring_volume_option_title" msgid="1520802026403038560">"Ring and notification volume"</string>
+    <string name="ring_volume_option_title" msgid="1520802026403038560">"Ring &amp; notification volume"</string>
     <string name="separate_ring_volume_option_title" msgid="2212910223857375951">"Ring volume"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"Notification volume"</string>
     <string name="ringtone_title" msgid="3271453110387368088">"Phone ringtone"</string>
@@ -3815,7 +3814,7 @@
     <string name="keywords_vibrate_for_calls" msgid="1019870409730074899">"Vibration"</string>
     <string name="vibrate_when_ringing_option_never_vibrate" msgid="6518980907289156517">"Never vibrate"</string>
     <string name="vibrate_when_ringing_option_always_vibrate" msgid="968652667232075466">"Always vibrate"</string>
-    <string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"Vibrate first, then ring gradually"</string>
+    <string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"Vibrate first then ring gradually"</string>
     <string name="other_sound_settings" msgid="5468360269346162072">"Other sounds"</string>
     <string name="spatial_audio_title" msgid="6591051622375191603">"Spatial audio"</string>
     <string name="dial_pad_tones_title" msgid="3536945335367914892">"Dial pad tones"</string>
@@ -3837,9 +3836,9 @@
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Wired headphones"</string>
     <string name="spatial_audio_text" msgid="8201387855375146000">"Audio from compatible media becomes more immersive"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"Off"</string>
-    <string name="spatial_summary_on_one" msgid="6239933399496282994">"On/<xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
+    <string name="spatial_summary_on_one" msgid="6239933399496282994">"On / <xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
     <string name="spatial_summary_on_two" msgid="4526919818832483883">"On / <xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> and <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
-    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"You can also turn on spatial audio for Bluetooth devices."</string>
+    <string name="spatial_audio_footer_title" msgid="8775010547623606088">"You can also turn on Spatial Audio for Bluetooth devices."</string>
     <string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Connected devices settings"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
@@ -3855,7 +3854,7 @@
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schedule"</string>
     <string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schedule"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silence phone at certain times"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set do not disturb rules"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set Do Not Disturb rules"</string>
     <string name="zen_mode_schedule_title" msgid="7064866561892906613">"Schedule"</string>
     <string name="zen_mode_use_automatic_rule" msgid="733850322530002484">"Use schedule"</string>
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3869,7 +3868,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="2152115038156049608">"When notifications arrive, your phone won’t make a sound or vibrate."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5997930361607752541">"No visuals or sound from notifications"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="6005445725686969583">"You won’t see or hear notifications"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"Your phone won’t show, vibrate or make sound for new or existing notifications. Bear in mind: critical notifications for phone activity and status will still appear.\n\nWhen you turn off Do Not Disturb, find missed notifications by swiping down from the top of your screen."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"Your phone won’t show, vibrate or make sound for new or existing notifications. Keep in mind, critical notifications for phone activity and status will still appear.\n\nWhen you turn off Do Not Disturb, find missed notifications by swiping down from the top of your screen."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="5469078057954463796">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4303255634151330401">"Enable custom setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="5062332754972217218">"Remove custom setting"</string>
@@ -3891,8 +3890,8 @@
     <string name="zen_mode_block_effect_summary_screen_off" msgid="6989818116297061488">"When screen is off"</string>
     <string name="zen_mode_block_effect_summary_screen_on" msgid="4876016548834916087">"When screen is on"</string>
     <string name="zen_mode_block_effect_summary_sound" msgid="1559968890497946901">"Sound and vibration"</string>
-    <string name="zen_mode_block_effect_summary_some" msgid="2730383453754229650">"Sound, vibration and some visual signs of notifications"</string>
-    <string name="zen_mode_block_effect_summary_all" msgid="3131918059492425222">"Sound, vibration and visual signs of notifications"</string>
+    <string name="zen_mode_block_effect_summary_some" msgid="2730383453754229650">"Sound, vibration, and some visual signs of notifications"</string>
+    <string name="zen_mode_block_effect_summary_all" msgid="3131918059492425222">"Sound, vibration, and visual signs of notifications"</string>
     <string name="zen_mode_blocked_effects_footer" msgid="1115914818435434668">"Notifications needed for basic phone activity and status will never be hidden."</string>
     <string name="zen_mode_no_exceptions" msgid="1580136061336585873">"None"</string>
     <string name="zen_mode_other_options" msgid="3399967231522580421">"other options"</string>
@@ -3908,29 +3907,29 @@
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="8255159194653341835">" "<annotation id="link">"View custom settings"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
     <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
     <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
-    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off / 1 schedule can turn on automatically}other{Off / # schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
-    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarms and other interruptions"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarms &amp; other interruptions"</string>
     <string name="zen_category_schedule" msgid="2003707171924226212">"Schedules"</string>
     <string name="zen_category_duration" msgid="7515850842082631460">"Duration for Quick Settings"</string>
     <string name="zen_settings_general" msgid="2704932194620124153">"General"</string>
-    <string name="zen_sound_footer" msgid="4090291351903631977">"When Do Not Disturb is on, sound and vibration will be muted, except for the items that you allow above."</string>
+    <string name="zen_sound_footer" msgid="4090291351903631977">"When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above."</string>
     <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"Custom settings"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Review schedule"</string>
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Got it"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Notifications"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duration"</string>
     <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Messages, events &amp; reminders"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you."</string>
-    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Finished"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you."</string>
+    <string name="zen_onboarding_ok" msgid="8764248406533833392">"Done"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Settings"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"No visuals or sound from notifications"</string>
     <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"No sound from notifications"</string>
@@ -3970,9 +3969,9 @@
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
     <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
-    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user changed importance settings and allow notification assistant to prioritize"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
-    <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
+    <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions &amp; replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
     <string name="notification_history" msgid="8663811361243456201">"Notification history"</string>
     <string name="notification_history_toggle" msgid="9093762294928569030">"Use notification history"</string>
@@ -3990,7 +3989,7 @@
     <string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen."</string>
     <string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
-    <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"All bubble settings"</string>
+    <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"All Bubble settings"</string>
     <string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bubble this conversation"</string>
     <string name="bubbles_conversation_toggle_summary" msgid="720229032254323578">"Show floating icon on top of apps"</string>
     <string name="bubbles_app_toggle_summary" msgid="1574515698567947948">"Allow <xliff:g id="APP_NAME">%1$s</xliff:g> to show some notifications as bubbles"</string>
@@ -3998,7 +3997,7 @@
     <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"Turning on bubbles for this app will also turn on bubbles for your device.\n\nThis affects other apps or conversations that are allowed to bubble."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="2042628067101419871">"Turn on"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"Cancel"</string>
-    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"On/Conversations can appear as floating icons"</string>
+    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"On / Conversations can appear as floating icons"</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Allow apps to show bubbles"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Some conversations will appear as floating icons on top of other apps"</string>
     <string name="bubble_app_setting_all" msgid="312524752846978277">"All conversations can bubble"</string>
@@ -4028,8 +4027,8 @@
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"When work profile is locked"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Notifications on lock screen"</string>
-    <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Show conversations, default and silent"</string>
-    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Show conversations, default and silent"</string>
+    <string name="lock_screen_notifs_show_all_summary" msgid="4226586018375762117">"Show conversations, default, and silent"</string>
+    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Show conversations, default, and silent"</string>
     <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Hide silent conversations and notifications"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Don’t show any notifications"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Sensitive notifications"</string>
@@ -4038,18 +4037,18 @@
     <string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Show sensitive work profile content when locked"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"Show all notification content"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"Show sensitive content only when unlocked"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"Don\'t show notifications at all"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"Don’t show notifications at all"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4688399629301178487">"How do you want the lock screen to display?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1360388192096354315">"Lock screen"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Show all work notification content"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"Hide sensitive work content"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"When your device is locked, how do you want profile notifications to be displayed?"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"When your device is locked, how do you want profile notifications to show?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"Profile notifications"</string>
     <string name="notifications_title" msgid="4221655533193721131">"Notifications"</string>
     <string name="app_notifications_title" msgid="248374669037385148">"App notifications"</string>
     <string name="notification_channel_title" msgid="8859880871692797611">"Notification category"</string>
     <string name="notification_group_title" msgid="7525666535695631538">"Notification category group"</string>
-    <string name="notification_importance_title" msgid="1545158655988342703">"Behaviour"</string>
+    <string name="notification_importance_title" msgid="1545158655988342703">"Behavior"</string>
     <string name="notification_importance_unspecified" msgid="1543165530748339700">"Allow sound"</string>
     <string name="notification_importance_blocked" msgid="4933285639639899394">"Never show notifications"</string>
     <string name="conversations_category_title" msgid="5586541340846847798">"Conversations"</string>
@@ -4070,7 +4069,7 @@
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
     <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
-    <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations that you’ve made changes to"</string>
+    <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations you’ve made changes to"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
     <string name="conversation_settings_clear_recents" msgid="8940398397663307054">"Clear recent conversations"</string>
     <string name="recent_convos_removed" msgid="2122932798895714203">"Recent conversations removed"</string>
@@ -4079,13 +4078,13 @@
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Priority and modified conversations will appear here"</string>
-    <string name="conversation_onboarding_summary" msgid="2484845363368486941">"Once you mark a conversation as priority, or make any other changes to conversations, they will appear here. \n\nTo change conversation settings: \nSwipe down from the top of the screen to open the pull-down shade, then touch and hold a conversation."</string>
-    <string name="notification_importance_min" msgid="4609688642942787774">"Show silently and minimise"</string>
+    <string name="conversation_onboarding_summary" msgid="2484845363368486941">"Once you mark a conversation as priority, or make any other changes to conversations, they will appear here. \n\nTo change conversation settings: \nSwipe down from the top of the screen to open the pull-down shade, then touch &amp; hold a conversation."</string>
+    <string name="notification_importance_min" msgid="4609688642942787774">"Show silently and minimize"</string>
     <string name="notification_importance_low" msgid="7562535765919565273">"Show silently"</string>
     <string name="notification_importance_default" msgid="7483906490369073043">"Make sound"</string>
-    <string name="notification_importance_high" msgid="8453789143477210550">"Make sound and pop up on screen"</string>
+    <string name="notification_importance_high" msgid="8453789143477210550">"Make sound and pop on screen"</string>
     <string name="notification_importance_high_silent" msgid="8977232884004607985">"Pop on screen"</string>
-    <string name="notification_importance_min_title" msgid="7676541266705442501">"Minimise"</string>
+    <string name="notification_importance_min_title" msgid="7676541266705442501">"Minimize"</string>
     <string name="notification_importance_low_title" msgid="658158049378796947">"Medium"</string>
     <string name="notification_importance_default_title" msgid="8875198696330289686">"High"</string>
     <string name="notification_importance_high_title" msgid="394129291760607808">"Pop on screen"</string>
@@ -4093,7 +4092,7 @@
     <string name="notification_silence_title" msgid="4085829874452944989">"Silent"</string>
     <string name="notification_alert_title" msgid="1632401211722199217">"Default"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"Allow interruptions"</string>
-    <string name="allow_interruption_summary" msgid="9044131663518112543">"Let the app make sound, vibrate and/or pop notifications on screen"</string>
+    <string name="allow_interruption_summary" msgid="9044131663518112543">"Let the app make sound, vibrate, and/or pop notifications on screen"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Priority"</string>
     <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Shows at top of conversation section, appears as floating bubble, displays profile picture on lock screen"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> doesn’t support most conversation features. You can’t set a conversation as priority, and conversations won’t appear as floating bubbles."</string>
@@ -4102,9 +4101,9 @@
     <string name="notification_conversation_summary_low" msgid="6352818857388412326">"No sound or vibration and appears lower in conversation section"</string>
     <string name="notification_channel_summary_default" msgid="3674057458265438896">"May ring or vibrate based on phone settings"</string>
     <string name="notification_channel_summary_high" msgid="3411637309360617621">"When device is unlocked, show notifications as a banner across the top of the screen"</string>
-    <string name="notification_switch_label" msgid="8029371325967501557">"All \'<xliff:g id="APP_NAME">%1$s</xliff:g>\' notifications"</string>
+    <string name="notification_switch_label" msgid="8029371325967501557">"All \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" notifications"</string>
     <string name="notification_app_switch_label" msgid="4422902423925084193">"All <xliff:g id="APP_NAME">%1$s</xliff:g> notifications"</string>
-    <string name="default_notification_assistant" msgid="243718059890346442">"Adaptive notifications"</string>
+    <string name="default_notification_assistant" msgid="243718059890346442">"Adaptive Notifications"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1319135950258375284">
       <item quantity="other">About <xliff:g id="NUMBER_1">%,d</xliff:g> notifications per day</item>
       <item quantity="one">About <xliff:g id="NUMBER_0">%d</xliff:g> notification per day</item>
@@ -4123,17 +4122,17 @@
       <item quantity="one">%d app can read notifications</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Enhanced notifications"</string>
-    <string name="notification_assistant_summary" msgid="1957783114840908887">"Get suggested actions, replies and more"</string>
+    <string name="notification_assistant_summary" msgid="1957783114840908887">"Get suggested actions, replies, and more"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"None"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"No installed apps have requested notification access."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Allow notification access"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Allow notification access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Enhanced notifications replaced Android adaptive notifications in Android 12. This feature shows suggested actions and replies, and organises your notifications. \n\nEnhanced notifications can access notification content, including personal information like contact names and messages. This feature can also dismiss or respond to notifications, such as answering phone calls, and control Do Not Disturb."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Enhanced notifications replaced Android Adaptive Notifications in Android 12. This feature shows suggested actions and replies, and organizes your notifications. \n\nEnhanced notifications can access notification content, including personal information like contact names and messages. This feature can also dismiss or respond to notifications, such as answering phone calls, and control Do Not Disturb."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Allow notification access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4317764112725749020">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications, including personal information such as contact names, photos and the text of messages that you receive. This app will also be able to snooze or dismiss notifications or take action on buttons in notifications, including answering phone calls. \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4317764112725749020">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications, including personal information such as contact names, photos, and the text of messages you receive. This app will also be able to snooze or dismiss notifications or take action on buttons in notifications, including answering phone calls. \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings."</string>
     <string name="nls_warning_prompt" msgid="9143226910825830619">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to:"</string>
     <string name="nls_feature_read_title" msgid="7629713268744220437">"Read your notifications"</string>
-    <string name="nls_feature_read_summary" msgid="1064698238110273593">"It can read your notifications, including personal information such as contacts, messages and photos."</string>
+    <string name="nls_feature_read_summary" msgid="1064698238110273593">"It can read your notifications, including personal information such as contacts, messages, and photos."</string>
     <string name="nls_feature_reply_title" msgid="7925455553821362039">"Reply to messages"</string>
     <string name="nls_feature_reply_summary" msgid="4492543411395565556">"It can reply to messages and take action on buttons in notifications, including snoozing or dismissing notifications and answering calls."</string>
     <string name="nls_feature_settings_title" msgid="8208164329853194414">"Change settings"</string>
@@ -4143,9 +4142,9 @@
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancel"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Allowed notification types"</string>
     <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
-    <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Ongoing communication from apps in use, navigation, phone calls and more"</string>
+    <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Ongoing communication from apps in use, navigation, phone calls, and more"</string>
     <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
-    <string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, text messages and other communications"</string>
+    <string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, text messages, and other communications"</string>
     <string name="notif_type_alerting" msgid="4713073696855718576">"Notifications"</string>
     <string name="notif_type_alerting_summary" msgid="4681068287836313604">"May ring or vibrate based on settings"</string>
     <string name="notif_type_silent" msgid="6273951794420331010">"Silent"</string>
@@ -4164,28 +4163,28 @@
     <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="4008841566387432721">"Reduce flicker"</string>
     <string name="picture_in_picture_title" msgid="9001594281840542493">"Picture-in-picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"No installed apps support picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"No installed apps support Picture-in-picture"</string>
     <string name="picture_in_picture_keywords" msgid="3605379820551656253">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"Allow picture-in-picture"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
-    <string name="interact_across_profiles_title" msgid="7285906999927669971">"Connected work and personal apps"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps you\'re using."</string>
+    <string name="interact_across_profiles_title" msgid="7285906999927669971">"Connected work &amp; personal apps"</string>
     <string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"Connected"</string>
     <string name="interact_across_profiles_summary_not_allowed" msgid="5802674212788171790">"Not connected"</string>
     <string name="interact_across_profiles_empty_text" msgid="419061031064397168">"No connected apps"</string>
     <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"cross profile connected app apps work and personal"</string>
-    <string name="interact_across_profiles_app_detail_title" msgid="7776184211173575648">"Connected work and personal apps"</string>
+    <string name="interact_across_profiles_app_detail_title" msgid="7776184211173575648">"Connected work &amp; personal apps"</string>
     <string name="interact_across_profiles_switch_enabled" msgid="7294719120282287495">"Connected"</string>
     <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"Connect these apps"</string>
     <string name="interact_across_profiles_summary_1" msgid="6093976896137600231">"Connected apps share permissions and can access each other’s data."</string>
     <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"Only connect apps if you trust them not to share personal data with your IT admin."</string>
-    <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"You can disconnect apps at any time in your device’s privacy settings."</string>
+    <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"You can disconnect apps anytime in your device’s privacy settings."</string>
     <string name="interact_across_profiles_consent_dialog_title" msgid="8530621211216508681">"Trust work <xliff:g id="NAME">%1$s</xliff:g> with your personal data?"</string>
     <string name="interact_across_profiles_consent_dialog_summary" msgid="3949870271562055048">"Only connect apps if you trust them not to share personal data with your IT admin."</string>
     <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"App data"</string>
     <string name="interact_across_profiles_consent_dialog_app_data_summary" msgid="6057019384328088311">"This app can access data in your personal <xliff:g id="NAME">%1$s</xliff:g> app."</string>
     <string name="interact_across_profiles_consent_dialog_permissions_title" msgid="2316852600280487055">"Permissions"</string>
-    <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"This app can use your personal <xliff:g id="NAME">%1$s</xliff:g> app’s permissions, like access to location, storage or contacts."</string>
+    <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"This app can use your personal <xliff:g id="NAME">%1$s</xliff:g> app’s permissions, like access to location, storage, or contacts."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"No apps connected"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps connected</item>
@@ -4251,12 +4250,12 @@
     <string name="zen_mode_add_time_rule" msgid="2621320450155364432">"Add time schedule"</string>
     <string name="zen_mode_delete_rule" msgid="5419296431989891130">"Delete schedule"</string>
     <string name="zen_mode_choose_rule_type" msgid="7656308563653982975">"Choose schedule type"</string>
-    <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"Delete \'<xliff:g id="RULE">%1$s</xliff:g>\' rule?"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"Delete “<xliff:g id="RULE">%1$s</xliff:g>” rule?"</string>
     <string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"Delete"</string>
     <string name="zen_mode_rule_type_unknown" msgid="7819162569994282316">"Unknown"</string>
-    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"These settings can\'t be changed at the moment. An app (<xliff:g id="APP_NAME">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behaviour."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"These settings can\'t be changed at the moment. An app has automatically turned on Do Not Disturb with custom behaviour."</string>
-    <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"These settings can\'t be changed at the moment. Do Not Disturb was manually turned on with custom behaviour."</string>
+    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"These settings can\'t be changed right now. An app (<xliff:g id="APP_NAME">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behavior."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"These settings can\'t be changed right now. An app has automatically turned on Do Not Disturb with custom behavior."</string>
+    <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"These settings can\'t be changed right now. Do Not Disturb was manually turned on with custom behavior."</string>
     <string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"Time"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"Automatic rule set to turn on Do Not Disturb during specified times"</string>
     <string name="zen_event_rule_type_name" msgid="1921166617081971754">"Event"</string>
@@ -4267,18 +4266,18 @@
     <string name="zen_mode_event_rule_summary_reply_template" msgid="7786137431469077008">"Where reply is <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="5152139705998281205">"Any calendar"</string>
     <string name="zen_mode_event_rule_reply" msgid="6099405414361340225">"Where reply is"</string>
-    <string name="zen_mode_event_rule_reply_any_except_no" msgid="4672746760505346596">"Yes, Maybe or Not replied"</string>
+    <string name="zen_mode_event_rule_reply_any_except_no" msgid="4672746760505346596">"Yes, Maybe, or Not replied"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="6584448788100186574">"Yes or Maybe"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="7812120982734551236">"Yes"</string>
     <string name="zen_mode_rule_not_found_text" msgid="5303667326973891036">"Rule not found."</string>
-    <string name="zen_mode_rule_summary_enabled_combination" msgid="1183604368083885789">"On/<xliff:g id="MODE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_rule_summary_enabled_combination" msgid="1183604368083885789">"On / <xliff:g id="MODE">%1$s</xliff:g>"</string>
     <string name="zen_mode_rule_summary_provider_combination" msgid="785343032708491365">"<xliff:g id="PACKAGE">%1$s</xliff:g>\n<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
     <string name="zen_mode_schedule_rule_days" msgid="8633770815307716351">"Days"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="5636604196262227070">"None"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="1583884351893245169">"Every day"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="305237266064819345">"Alarm can override end time"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="9162760856136645133">"Schedule turns off when an alarm rings"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="92525364576358085">"Do Not Disturb behaviour"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="92525364576358085">"Do Not Disturb behavior"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="3259312823717839148">"Use default settings"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="5390522750884328843">"Create custom settings for this schedule"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7815612569425733764">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’"</string>
@@ -4293,22 +4292,22 @@
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
-    <string name="zen_mode_people_footer" msgid="7710707353004137431">"Even if messaging or calling apps can\'t notify you, people that you choose here can still reach you through those apps"</string>
+    <string name="zen_mode_people_footer" msgid="7710707353004137431">"Even if messaging or calling apps can\'t notify you, people you choose here can still reach you through those apps"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
     <string name="zen_mode_calls_list" msgid="5044730950895749093">"calls"</string>
     <string name="zen_mode_calls_header" msgid="8379225445095856726">"Calls that can interrupt"</string>
-    <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
-    <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure allowed calls make sound, check that device is set to ring"</string>
+    <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2}, and {contact_3}}other{{contact_1}, {contact_2}, and # others}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(No name)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
     <string name="zen_mode_messages_header" msgid="253721635061451577">"Messages that can interrupt"</string>
-    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"To make sure that allowed messages make a sound, check that the device is set to ring"</string>
-    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
+    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"To make sure allowed messages make sound, check that device is set to ring"</string>
+    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
     <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
@@ -4322,11 +4321,11 @@
     <string name="zen_mode_none_calls" msgid="2047166006414016327">"None"</string>
     <string name="zen_mode_none_messages" msgid="1386626352943268342">"None"</string>
     <string name="zen_mode_alarms" msgid="5989343060100771099">"Alarms"</string>
-    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"From timers, alarms, security systems and other apps"</string>
+    <string name="zen_mode_alarms_summary" msgid="3388679177457223967">"From timers, alarms, security systems, and other apps"</string>
     <string name="zen_mode_alarms_list" msgid="334782233067365405">"alarms"</string>
     <string name="zen_mode_alarms_list_first" msgid="2780418316613576610">"Alarms"</string>
     <string name="zen_mode_media" msgid="885017672250984735">"Media sounds"</string>
-    <string name="zen_mode_media_summary" msgid="7174081803853351461">"Sounds from videos, games and other media"</string>
+    <string name="zen_mode_media_summary" msgid="7174081803853351461">"Sounds from videos, games, and other media"</string>
     <string name="zen_mode_media_list" msgid="2006413476596092020">"media"</string>
     <string name="zen_mode_media_list_first" msgid="7824427062528618442">"Media"</string>
     <string name="zen_mode_system" msgid="7301665021634204942">"Touch sounds"</string>
@@ -4350,13 +4349,13 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2}, and {app_3} can interrupt}other{{app_1}, {app_2}, and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2}, and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2}, and # more can interrupt}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
@@ -4397,7 +4396,7 @@
     <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"Let notifications silenced by Do Not Disturb turn on the screen"</string>
     <string name="notification_app_settings_button" msgid="4692549882609342128">"Notification settings"</string>
     <string name="warning_button_text" msgid="1274234338874005639">"Warning"</string>
-    <string name="suggestion_button_text" msgid="4370673818678692873">"OK"</string>
+    <string name="suggestion_button_text" msgid="4370673818678692873">"Ok"</string>
     <string name="suggestion_button_close" msgid="6865170855573283759">"Close"</string>
     <string name="device_feedback" msgid="5351614458411688608">"Send feedback about this device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"Enter admin PIN"</string>
@@ -4411,30 +4410,30 @@
     <string name="app_pinning_intro" msgid="6409063008733004245">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game."</string>
     <string name="screen_pinning_description" msgid="4305370471370474846">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1. Turn on app pinning 	\n2. Open Overview 	\n3. Tap the app icon at the top of the screen, then tap Pin"</string>
     <string name="screen_pinning_guest_user_description" msgid="2465729370037556955">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1. Turn on app pinning 	\n2. Open Overview 	\n3. Tap the app icon at the top of the screen, then tap Pin"</string>
-    <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"When app is pinned: \n\n• Personal data may be accessible \n(such as contacts and email content) \n• Pinned app may open other apps \n\nOnly use app pinning with people you trust."</string>
+    <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"When app is pinned: \n\n•		Personal data may be accessible \n		(such as contacts and email content) \n•		Pinned app may open other apps \n\nOnly use app pinning with people you trust."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"Lock device when unpinning"</string>
     <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"Confirm SIM deletion"</string>
-    <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"Verify that it\'s you before erasing a downloaded SIM"</string>
+    <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"Verify it\'s you before erasing a downloaded SIM"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="2633920317425356619">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="869354050717870055">"(Experimental)"</string>
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="3591796237625134622">"Continue"</string>
-    <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
-    <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
-    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
-    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
-    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricted"</string>
@@ -4442,12 +4441,12 @@
     <string name="encrypt_talkback_dialog_require_pin" msgid="8974156384205924887">"Require PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1587587568721873184">"Require pattern?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="2701793623210531836">"Require password?"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="4482887117824444481">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="5156321541636018756">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="1917287751192953034">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="4482887117824444481">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won’t yet be available."</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="5156321541636018756">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won’t yet be available."</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="1917287751192953034">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won’t yet be available."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="5766006106305996844">"Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone"</string>
     <string name="imei_information_title" msgid="8703564992893669514">"IMEI information"</string>
-    <string name="imei_information_summary" msgid="4763358372990258786">"IMEI-related information"</string>
+    <string name="imei_information_summary" msgid="4763358372990258786">"IMEI relative information"</string>
     <string name="slot_number" msgid="2663789411468530397">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="892824422067985734">"Open by default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Opening links"</string>
@@ -4524,10 +4523,10 @@
     </plurals>
     <string name="unused_apps_category" msgid="8954930958175500851">"Unused app settings"</string>
     <string name="unused_apps_switch" msgid="7595419855882245772">"Pause app activity if unused"</string>
-    <string name="unused_apps_switch_summary" msgid="2171098908014596802">"Remove permissions, delete temporary files and stop notifications"</string>
+    <string name="unused_apps_switch_summary" msgid="2171098908014596802">"Remove permissions, delete temporary files, and stop notifications"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"All apps"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"Installed apps"</string>
-    <string name="filter_instant_apps" msgid="2292108467020380068">"Instant Apps"</string>
+    <string name="filter_instant_apps" msgid="2292108467020380068">"Instant apps"</string>
     <string name="filter_notif_all_apps" msgid="2764590815789208306">"Apps: All"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"Turned off"</string>
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"Categories: Urgent importance"</string>
@@ -4561,11 +4560,11 @@
     <string name="open_supported_links_footer" msgid="3188808142432787933">"App claims to handle following links:"</string>
     <string name="default_apps_title" msgid="6943471331817718664">"Default"</string>
     <string name="default_for_work" msgid="537558180548617528">"Default for work"</string>
-    <string name="assist_and_voice_input_title" msgid="6317935163145135914">"Assist and voice input"</string>
+    <string name="assist_and_voice_input_title" msgid="6317935163145135914">"Assist &amp; voice input"</string>
     <string name="default_assist_title" msgid="1182435129627493758">"Digital assistant app"</string>
     <string name="default_digital_assistant_title" msgid="5654663086385490838">"Default digital assistant app"</string>
     <string name="assistant_security_warning_title" msgid="6444187332360938730">"Make <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> your assistant?"</string>
-    <string name="assistant_security_warning" msgid="5623237187748811070">"The assistant will be able to read information about apps that are in use on your system, including information visible on your screen or accessible within the apps."</string>
+    <string name="assistant_security_warning" msgid="5623237187748811070">"The assistant will be able to read information about apps in use on your system, including information visible on your screen or accessible within the apps."</string>
     <string name="assistant_security_warning_agree" msgid="9013334158753473359">"Agree"</string>
     <string name="assistant_security_warning_disagree" msgid="1539182108068356410">"Disagree"</string>
     <string name="choose_voice_input_title" msgid="4855506199101586943">"Choose voice input"</string>
@@ -4604,8 +4603,8 @@
       <item quantity="other">Apps draining battery</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> draining battery</item>
     </plurals>
-    <string name="high_power_filter_on" msgid="447849271630431531">"Not optimised"</string>
-    <string name="high_power_on" msgid="8778058701270819268">"Not optimised"</string>
+    <string name="high_power_filter_on" msgid="447849271630431531">"Not optimized"</string>
+    <string name="high_power_on" msgid="8778058701270819268">"Not optimized"</string>
     <string name="high_power_off" msgid="317000444619279018">"Optimizing battery use"</string>
     <string name="high_power_system" msgid="3966701453644915787">"Battery optimization not available"</string>
     <string name="high_power_desc" msgid="2753076899835765338">"Don\'t apply battery optimization. May drain your battery more quickly."</string>
@@ -4628,7 +4627,7 @@
     <string name="usb_use_charging_only" msgid="1743303747327057947">"No data transfer"</string>
     <string name="usb_use_charging_only_desc" msgid="1234421230461847336">"Just charge this device"</string>
     <string name="usb_use_power_only" msgid="3408055485802114621">"Charge connected device"</string>
-    <string name="usb_use_file_transfers" msgid="483915710802018503">"File transfer"</string>
+    <string name="usb_use_file_transfers" msgid="483915710802018503">"File Transfer"</string>
     <string name="usb_use_file_transfers_desc" msgid="1020257823387107336">"Transfer files to another device"</string>
     <string name="usb_use_photo_transfers" msgid="4641181628966036093">"PTP"</string>
     <string name="usb_transcode_files" msgid="2441954752105119109">"Convert videos to AVC"</string>
@@ -4667,7 +4666,7 @@
     <string name="assist_access_screenshot_summary" msgid="5276593070956201863">"Allow the assist app to access an image of the screen"</string>
     <string name="assist_flash_title" msgid="5449512572885550108">"Flash screen"</string>
     <string name="assist_flash_summary" msgid="3032289860177784594">"Flash edges of screen when assist app accesses text from screen or screenshot"</string>
-    <string name="assist_footer" msgid="8248015363806299068">"Assist apps can help you based on information from the screen that you’re viewing. Some apps support both launcher and voice input services to give you integrated assistance."</string>
+    <string name="assist_footer" msgid="8248015363806299068">"Assist apps can help you based on information from the screen you’re viewing. Some apps support both launcher and voice input services to give you integrated assistance."</string>
     <string name="average_memory_use" msgid="717313706368825388">"Average memory use"</string>
     <string name="maximum_memory_use" msgid="2171779724001152933">"Maximum memory use"</string>
     <string name="memory_usage" msgid="5594133403819880617">"Memory usage"</string>
@@ -4675,8 +4674,8 @@
     <string name="memory_details" msgid="6133226869214421347">"Details"</string>
     <string name="memory_use_summary" msgid="3915964794146424142">"<xliff:g id="SIZE">%1$s</xliff:g> avg memory used in last 3 hours"</string>
     <string name="no_memory_use_summary" msgid="6708111974923274436">"No memory used in last 3 hours"</string>
-    <string name="sort_avg_use" msgid="4416841047669186903">"Sort by avg. use"</string>
-    <string name="sort_max_use" msgid="3370552820889448484">"Sort by max. use"</string>
+    <string name="sort_avg_use" msgid="4416841047669186903">"Sort by avg use"</string>
+    <string name="sort_max_use" msgid="3370552820889448484">"Sort by max use"</string>
     <string name="memory_performance" msgid="5448274293336927570">"Performance"</string>
     <string name="total_memory" msgid="5244174393008910567">"Total memory"</string>
     <string name="average_used" msgid="690235917394070169">"Average used (%)"</string>
@@ -4694,11 +4693,11 @@
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Must stay turned on because notification access is on"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Revoke access to Do Not Disturb for <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"All Do Not Disturb rules created by this app will be removed."</string>
-    <string name="ignore_optimizations_on" msgid="6865583039303804932">"Don’t optimise"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimise"</string>
+    <string name="ignore_optimizations_on" msgid="6865583039303804932">"Don’t optimize"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"May drain your battery more quickly. App will no longer be restricted from using background battery."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Recommended for better battery life"</string>
-    <string name="ignore_optimizations_title" msgid="3464172726254542889">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimisations?"</string>
+    <string name="ignore_optimizations_title" msgid="3464172726254542889">"Allow <xliff:g id="APP">%s</xliff:g> to ignore battery optimizations?"</string>
     <string name="app_list_preference_none" msgid="1635406344616653756">"None"</string>
     <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Turning off usage access for this app doesn\'t prevent your admin from tracking data usage for apps in your work profile"</string>
     <string name="accessibility_lock_screen_progress" msgid="4597298121698665401">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> characters used"</string>
@@ -4707,7 +4706,7 @@
     <string name="system_alert_window_apps_title" msgid="1537949185175079866">"Apps"</string>
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"Display over other apps"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"Allow display over other apps"</string>
-    <string name="allow_overlay_description" msgid="1607235723669496298">"Allow this app to display on top of other apps that you’re using. This app will be able to see where you tap or change what’s displayed on the screen."</string>
+    <string name="allow_overlay_description" msgid="1607235723669496298">"Allow this app to display on top of other apps you’re using. This app will be able to see where you tap or change what’s displayed on the screen."</string>
     <string name="manage_external_storage_title" msgid="8024521099838816100">"All files access"</string>
     <string name="permit_manage_external_storage" msgid="6928847280689401761">"Allow access to manage all files"</string>
     <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Allow this app to read, modify and delete all files on this device or any connected storage volumes. If granted, app may access files without your explicit knowledge."</string>
@@ -4716,7 +4715,7 @@
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"Allow app to manage media"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"If allowed, this app can modify or delete media files created with other apps without asking you. App must have permission to access files and media."</string>
     <string name="keywords_media_management_apps" msgid="7499959607583088690">"Media, File, Management, Manager, Manage, Edit, Editor, App, Application, Program"</string>
-    <string name="keywords_vr_listener" msgid="902737490270081131">"VR virtual reality listener stereo helper service"</string>
+    <string name="keywords_vr_listener" msgid="902737490270081131">"vr virtual reality listener stereo helper service"</string>
     <string name="overlay_settings" msgid="2030836934139139469">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="1435856750594492891">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
     <string name="filter_overlay_apps" msgid="2483998217116789206">"Apps with permission"</string>
@@ -4741,7 +4740,7 @@
     <string name="camera_double_tap_power_gesture_desc" msgid="1539147023700755155">"Quickly open camera without unlocking your screen"</string>
     <string name="screen_zoom_title" msgid="6928045302654960559">"Display size"</string>
     <string name="screen_zoom_short_summary" msgid="756254364808639194">"Make everything bigger or smaller"</string>
-    <string name="screen_zoom_keywords" msgid="5964023524422386592">"display, density, screen zoom, scale, scaling"</string>
+    <string name="screen_zoom_keywords" msgid="5964023524422386592">"display density, screen zoom, scale, scaling"</string>
     <string name="screen_zoom_summary" msgid="1362984939045594989">"Make the items on your screen smaller or larger. Some apps on your screen may change position."</string>
     <string name="screen_zoom_preview_title" msgid="5288355628444562735">"Preview"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="2628662648068995971">"Make smaller"</string>
@@ -4750,12 +4749,12 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="4873109337506890558">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="2641317981482545659">"Hi Pete!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6528272610590915790">"Hey, want to grab coffee and catch up today?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="6930848361702066106">"Sounds great. I know a good place not too far from here."</string>
+    <string name="screen_zoom_conversation_message_3" msgid="6930848361702066106">"Sounds great. I know of a good place not too far from here."</string>
     <string name="screen_zoom_conversation_message_4" msgid="2501043894465807210">"Perfect!"</string>
-    <string name="screen_zoom_conversation_timestamp_1" msgid="512353741016062507">"Tue 6:00 p.m."</string>
-    <string name="screen_zoom_conversation_timestamp_2" msgid="472183807915497199">"Tue 6:01 p.m."</string>
-    <string name="screen_zoom_conversation_timestamp_3" msgid="1659313906250856104">"Tue 6:02 p.m."</string>
-    <string name="screen_zoom_conversation_timestamp_4" msgid="2046797647382623313">"Tue 6:03 p.m."</string>
+    <string name="screen_zoom_conversation_timestamp_1" msgid="512353741016062507">"Tue 6:00PM"</string>
+    <string name="screen_zoom_conversation_timestamp_2" msgid="472183807915497199">"Tue 6:01PM"</string>
+    <string name="screen_zoom_conversation_timestamp_3" msgid="1659313906250856104">"Tue 6:02PM"</string>
+    <string name="screen_zoom_conversation_timestamp_4" msgid="2046797647382623313">"Tue 6:03PM"</string>
     <string name="disconnected" msgid="3469373726996129247">"Not connected"</string>
     <string name="keyboard_disconnected" msgid="796053864561894531">"Not connected"</string>
     <string name="data_usage_summary_format" msgid="6844301859713164522">"<xliff:g id="AMOUNT">%1$s</xliff:g> of data used"</string>
@@ -4767,15 +4766,15 @@
     <string name="notification_summary_none" msgid="9179312319023988089">"On for all apps"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> apps installed"</string>
     <string name="apps_summary_example" msgid="6034002063446955592">"24 apps installed"</string>
-    <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
-    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
+    <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> used - <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
+    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used - <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
     <string name="display_summary" msgid="5526061030874717172">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="display_dashboard_summary" msgid="1599453894989339454">"Dark theme, font size, brightness"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"Sleep after 10 minutes of inactivity"</string>
     <string name="memory_summary" msgid="8221954450951651735">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
     <string name="users_summary" msgid="8473589474976307510">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="5513009140568552693">"<xliff:g id="APP_NAME">%1$s</xliff:g> is default"</string>
-    <string name="backup_disabled" msgid="4503062265560959320">"Backup disabled"</string>
+    <string name="backup_disabled" msgid="4503062265560959320">"Back up disabled"</string>
     <string name="android_version_summary" msgid="7818952662015042768">"Updated to Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="5404532347171027730">"Update available"</string>
     <string name="disabled_by_policy_title" msgid="3635622338687810583">"Blocked by your IT admin"</string>
@@ -4788,12 +4787,12 @@
     <string name="disabled_by_policy_title_financed_device" msgid="2328740314082888228">"Blocked by your credit provider"</string>
     <string name="disabled_by_policy_title_biometric_parental_consent" msgid="2463673997797134678">"Parent needed"</string>
     <string name="disabled_by_policy_content_biometric_parental_consent" msgid="7124116806784305206">"Hand the phone to your parent to start setting this up"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"If you have any questions, contact your IT admin"</string>
+    <string name="default_admin_support_msg" msgid="8338570262037182531">"If you have questions, contact your IT admin"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"More details"</string>
-    <string name="admin_profile_owner_message" msgid="8860709969532649195">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
-    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
-    <string name="admin_device_owner_message" msgid="5503131744126520590">"Your admin can monitor and manage apps and data associated with this device, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
-    <string name="admin_financed_message" msgid="1156197630834947884">"Your device administrator may be able to access data associated with this device, manage apps and change this device\'s settings."</string>
+    <string name="admin_profile_owner_message" msgid="8860709969532649195">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity, and the device\'s location information."</string>
+    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity, and the device\'s location information."</string>
+    <string name="admin_device_owner_message" msgid="5503131744126520590">"Your admin can monitor and manage apps and data associated with this device, including settings, permissions, corporate access, network activity, and the device\'s location information."</string>
+    <string name="admin_financed_message" msgid="1156197630834947884">"Your device administrator may be able to access data associated with this device, manage apps, and change this devices settings."</string>
     <string name="condition_turn_off" msgid="402707350778441939">"Turn off"</string>
     <string name="condition_turn_on" msgid="3911077299444314791">"Turn on"</string>
     <string name="condition_expand_show" msgid="1501084007540953213">"Show"</string>
@@ -4808,7 +4807,7 @@
     <string name="condition_battery_summary" msgid="8436806157833107886">"Features restricted"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"Mobile data is off"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"Internet only available via Wi‑Fi"</string>
-    <string name="condition_bg_data_title" msgid="2719263664589753094">"Data saver"</string>
+    <string name="condition_bg_data_title" msgid="2719263664589753094">"Data Saver"</string>
     <string name="condition_bg_data_summary" msgid="1736255283216193834">"Features restricted"</string>
     <string name="condition_work_title" msgid="174326145616998813">"Work profile is off"</string>
     <string name="condition_work_summary" msgid="7113473121312772398">"For apps &amp; notifications"</string>
@@ -4822,7 +4821,7 @@
     <string name="condition_night_display_title" msgid="1072880897812554421">"Night Light is on"</string>
     <string name="condition_night_display_summary" msgid="3278349775875166984">"Screen tinted amber"</string>
     <string name="condition_grayscale_title" msgid="9029271080007984542">"Greyscale"</string>
-    <string name="condition_grayscale_summary" msgid="1306034149271251292">"Display only in grey colour"</string>
+    <string name="condition_grayscale_summary" msgid="1306034149271251292">"Display only in gray color"</string>
     <string name="homepage_condition_footer_content_description" msgid="1568313430995646108">"Collapse"</string>
     <string name="suggestions_title_v2" msgid="421003737901460147">"Suggested for You"</string>
     <string name="suggestions_title" msgid="61841299295602686">"Suggestions"</string>
@@ -4837,10 +4836,10 @@
       <item quantity="one">+1 suggestion</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Remove"</string>
-    <string name="color_temperature" msgid="8256912135746305176">"Cool colour temperature"</string>
-    <string name="color_temperature_desc" msgid="6713259535885669622">"Use cooler display colours"</string>
-    <string name="color_temperature_toast" msgid="7611532183532407342">"To apply colour change, turn off screen"</string>
-    <string name="camera_laser_sensor_switch" msgid="7097842750947187671">"Camera laser sensor"</string>
+    <string name="color_temperature" msgid="8256912135746305176">"Cool color temperature"</string>
+    <string name="color_temperature_desc" msgid="6713259535885669622">"Use cooler display colors"</string>
+    <string name="color_temperature_toast" msgid="7611532183532407342">"To apply color change, turn off screen"</string>
+    <string name="camera_laser_sensor_switch" msgid="7097842750947187671">"Camera Laser Sensor"</string>
     <string name="ota_disable_automatic_update" msgid="1953894421412420231">"Automatic system updates"</string>
     <string name="ota_disable_automatic_update_summary" msgid="7803279951533276841">"Apply updates when device restarts"</string>
     <string name="usage" msgid="287782903846013936">"Usage"</string>
@@ -4858,7 +4857,7 @@
     <string name="app_usage_cycle" msgid="341009528778520583">"Mobile data usage cycle"</string>
     <string name="cell_data_warning" msgid="5664921950473359634">"<xliff:g id="ID_1">^1</xliff:g> data warning"</string>
     <string name="cell_data_limit" msgid="256855024790622112">"<xliff:g id="ID_1">^1</xliff:g> data limit"</string>
-    <string name="cell_data_warning_and_limit" msgid="8393200831986035724">"<xliff:g id="ID_1">^1</xliff:g> data warning/<xliff:g id="ID_2">^2</xliff:g> data limit"</string>
+    <string name="cell_data_warning_and_limit" msgid="8393200831986035724">"<xliff:g id="ID_1">^1</xliff:g> data warning / <xliff:g id="ID_2">^2</xliff:g> data limit"</string>
     <string name="billing_cycle_fragment_summary" msgid="6346655500491631357">"Monthly on day <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8385824604048229846">"Network restrictions"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
@@ -4893,7 +4892,7 @@
       <item quantity="one">%d day left</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"No time remaining"</string>
-    <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Less than one day left"</string>
+    <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Less than 1 day left"</string>
     <string name="carrier_and_update_text" msgid="5363656651921656280">"Updated by <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> ago"</string>
     <string name="no_carrier_update_text" msgid="5432798085593055966">"Updated <xliff:g id="ID_1">^2</xliff:g> ago"</string>
     <string name="carrier_and_update_now_text" msgid="5075861262344398849">"Updated by <xliff:g id="ID_1">^1</xliff:g> just now"</string>
@@ -4911,9 +4910,9 @@
     <string name="home_app" msgid="6056850504746902747">"Home app"</string>
     <string name="no_default_home" msgid="3588073707316139318">"No default Home"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"Secure start-up"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Require pattern to start up your device. While off, this device can\'t receive calls, messages, notifications or alarms."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Require PIN to start up your device. While off, this device can\'t receive calls, messages, notifications or alarms."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Require password to start up your device. While off, this device can\'t receive calls, messages, notifications or alarms."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Require pattern to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Require PIN to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Require password to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Add another fingerprint"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Unlock with a different finger"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"On"</string>
@@ -4925,12 +4924,12 @@
     <string name="app_battery_usage_title" msgid="346558380609793334">"App battery usage"</string>
     <string name="app_battery_usage_summary" msgid="6349965904306339539">"Set battery usage for apps"</string>
     <string name="filter_battery_unrestricted_title" msgid="821027369424198223">"Unrestricted"</string>
-    <string name="filter_battery_optimized_title" msgid="8236647176487754796">"Optimised"</string>
+    <string name="filter_battery_optimized_title" msgid="8236647176487754796">"Optimized"</string>
     <string name="filter_battery_restricted_title" msgid="5886859505802563232">"Restricted"</string>
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spell checker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4950,14 +4949,14 @@
     <string name="notification_log_details_actions" msgid="2269605330470905236">"actions"</string>
     <string name="notification_log_details_title" msgid="8365761340979164197">"title"</string>
     <string name="notification_log_details_remoteinput" msgid="264204203044885921">"remote inputs"</string>
-    <string name="notification_log_details_content_view" msgid="7193602999512479112">"customised view"</string>
+    <string name="notification_log_details_content_view" msgid="7193602999512479112">"custom view"</string>
     <string name="notification_log_details_extras" msgid="8602887256103970989">"extras"</string>
     <string name="notification_log_details_icon" msgid="6728710746466389675">"icon"</string>
     <string name="notification_log_details_parcel" msgid="2098454650154230531">"parcel size"</string>
     <string name="notification_log_details_ashmem" msgid="6163312898302809015">"ashmem"</string>
     <string name="notification_log_details_alerted" msgid="5285078967825048406">"notification alerted"</string>
     <string name="notification_log_channel" msgid="3406738695621767204">"channel"</string>
-    <string name="notification_log_details_none" msgid="1090852853755089991">"None"</string>
+    <string name="notification_log_details_none" msgid="1090852853755089991">"none"</string>
     <string name="notification_log_details_ranking_null" msgid="6607596177723101524">"Ranking object is missing."</string>
     <string name="notification_log_details_ranking_none" msgid="2484105338466675261">"Ranking object doesn\'t contain this key."</string>
     <string name="theme_customization_device_default" msgid="7641813022590999286">"Device default"</string>
@@ -4988,13 +4987,13 @@
     <string name="dark_ui_mode" msgid="898146394425795281">"Dark theme"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="4554134480159161533">"Temporarily disabled due to Battery Saver"</string>
     <string name="ambient_camera_summary_battery_saver_on" msgid="1787784892047029560">"Temporarily disabled due to Battery Saver"</string>
-    <string name="ambient_camera_battery_saver_off" msgid="689825730569761613">"Turn off Battery Saver"</string>
+    <string name="ambient_camera_battery_saver_off" msgid="689825730569761613">"Turn off battery saver"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Temporarily turned on due to Battery Saver"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Try Dark theme"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Helps extend battery life"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Quick settings developer tiles"</string>
-    <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Disable adb authorisation timeout"</string>
-    <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Disable automatic revocation of adb authorisations for systems that have not reconnected within the default (seven days) or user-configured (minimum one day) amount of time."</string>
+    <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Disable adb authorization timeout"</string>
+    <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Disable automatic revocation of adb authorizations for systems that have not reconnected within the default (7 days) or user-configured (minimum 1 day) amount of time."</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"Winscope Trace"</string>
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"Sensors Off"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"Work profile settings"</string>
@@ -5015,17 +5014,17 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use Storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
     <string name="gesture_preference_title" msgid="8291899281322647187">"Gestures"</string>
-    <string name="gesture_preference_summary" product="default" msgid="7941981260703379398">"Quick Gestures to control your phone"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="4031666250963488007">"Quick Gestures to control your tablet"</string>
-    <string name="gesture_preference_summary" product="device" msgid="3520072325356373349">"Quick Gestures to control your device"</string>
+    <string name="gesture_preference_summary" product="default" msgid="7941981260703379398">"Quick gestures to control your phone"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="4031666250963488007">"Quick gestures to control your tablet"</string>
+    <string name="gesture_preference_summary" product="device" msgid="3520072325356373349">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Quickly open camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="4299496243418753571">"Open camera quickly"</string>
@@ -5037,19 +5036,19 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"To switch apps, swipe up on the Home button. To see all apps, swipe up again. To go back, tap the back button."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Try the new Home button"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Turn on the new gesture to switch apps"</string>
-    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Safety and emergency"</string>
+    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Safety &amp; emergency"</string>
     <string name="emergency_dashboard_summary" msgid="401033951074039302">"Emergency SOS, medical info, alerts"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Gesture navigation"</string>
     <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"To go Home, swipe up from the bottom of the screen. To switch apps, swipe up from the bottom, hold, then release. To go back, swipe from either the left or right edge."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3-button navigation"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Go back, Home and switch apps with buttons at the bottom of your screen."</string>
-    <string name="keywords_system_navigation" msgid="3131782378486554934">"system navigation, 2-button navigation, 3-button navigation, gesture navigation, swipe"</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Go back, Home, and switch apps with buttons at the bottom of your screen."</string>
+    <string name="keywords_system_navigation" msgid="3131782378486554934">"system navigation, 2 button navigation, 3 button navigation, gesture navigation, swipe"</string>
     <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"Not supported by your default home app, <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>"</string>
     <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"Switch default home app"</string>
     <string name="assistant_gesture_category_title" msgid="2478251256585807920">"Digital assistant"</string>
-    <string name="assistant_corner_gesture_title" msgid="1895061522687002106">"Swipe to invoke the assistant"</string>
+    <string name="assistant_corner_gesture_title" msgid="1895061522687002106">"Swipe to invoke assistant"</string>
     <string name="assistant_corner_gesture_summary" msgid="7279576276455168075">"Swipe up from a bottom corner to invoke digital assistant app."</string>
-    <string name="assistant_long_press_home_gesture_title" msgid="4865972278738178753">"Hold home for Assistant"</string>
+    <string name="assistant_long_press_home_gesture_title" msgid="4865972278738178753">"Hold Home for Assistant"</string>
     <string name="assistant_long_press_home_gesture_summary" msgid="592882226105081447">"Press and hold the Home button to invoke digital assistant app."</string>
     <string name="information_label" msgid="6939310810756569298">"Information"</string>
     <string name="low_label" msgid="6525629096999711220">"Low"</string>
@@ -5057,8 +5056,8 @@
     <string name="left_edge" msgid="1513576842959071849">"Left edge"</string>
     <string name="right_edge" msgid="1505309103265829121">"Right edge"</string>
     <string name="back_sensitivity_dialog_message" msgid="6638367716784103306">"Higher sensitivity may conflict with any app gestures along the edges of the screen."</string>
-    <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"Back sensitivity"</string>
-    <string name="gesture_settings_activity_title" msgid="2025828425762595733">"Gesture navigation sensitivity"</string>
+    <string name="back_sensitivity_dialog_title" msgid="6153608904168908264">"Back Sensitivity"</string>
+    <string name="gesture_settings_activity_title" msgid="2025828425762595733">"Gesture Navigation Sensitivity"</string>
     <string name="button_navigation_settings_activity_title" msgid="7335636045504461813">"Button navigation"</string>
     <string name="keywords_gesture_navigation_settings" msgid="667561222717238931">"gesture navigation, back sensitivity, back gesture"</string>
     <string name="keywords_button_navigation_settings" msgid="7888812253110553920">"navigation, home button"</string>
@@ -5071,28 +5070,28 @@
     <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="one_handed_mode_swipe_down_category" msgid="110178629274462484">"Swipe down to"</string>
     <string name="one_handed_mode_use_shortcut_category" msgid="1414714099339147711">"Use the shortcut to"</string>
-    <string name="one_handed_mode_intro_text" msgid="7921988617828924342">"Pull down the top half of your screen so that it’s easier to reach with one hand"</string>
-    <string name="one_handed_mode_footer_text" msgid="6336209800330679840">" "<b>"How to use one-handed mode"</b>\n" • Make sure that gesture navigation is selected in system navigation settings\n • Swipe down near the bottom edge of the screen"</string>
+    <string name="one_handed_mode_intro_text" msgid="7921988617828924342">"Pull down the top half of your screen so it’s easier to reach with one hand"</string>
+    <string name="one_handed_mode_footer_text" msgid="6336209800330679840">" "<b>"How to use one-handed mode"</b>\n" • Make sure gesture navigation is selected in system navigation settings\n • Swipe down near the bottom edge of the screen"</string>
     <string name="one_handed_action_pull_down_screen_title" msgid="9187194533815438150">"Pull screen into reach"</string>
     <string name="one_handed_action_pull_down_screen_summary" msgid="7582432473450036628">"The top of the screen will move into reach of your thumb."</string>
     <string name="one_handed_action_show_notification_title" msgid="8789305491485437130">"Show notifications"</string>
     <string name="one_handed_action_show_notification_summary" msgid="8281689861222000436">"Notifications and settings will appear."</string>
-    <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
+    <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications, and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="8980156994848721455">"Lift to check device"</string>
     <string name="ambient_display_wake_screen_title" msgid="7637678749035378085">"Wake up display"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="1087355013674109242">"To check time, notifications and other info, pick up your phone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2589556997034530529">"To check time, notifications and other info, pick up your tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="1916011370011115627">"To check time, notifications and other info, pick up your device."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="1087355013674109242">"To check time, notifications, and other info, pick up your phone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="2589556997034530529">"To check time, notifications, and other info, pick up your tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="1916011370011115627">"To check time, notifications, and other info, pick up your device."</string>
     <string name="ambient_display_tap_screen_title" product="default" msgid="2811332293938467179">"Tap to check phone"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
-    <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications, and other info, tap your screen."</string>
     <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
     <string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"Use Emergency SOS"</string>
     <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"Press the power button quickly five times or more to start the actions below"</string>
+    <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"Press the Power button quickly 5 times or more to start the actions below"</string>
     <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Play countdown alarm"</string>
     <string name="emergency_gesture_sound_setting_summary" msgid="6573377104470235173">"Play a loud sound when Emergency SOS is starting"</string>
     <string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"Notify for help"</string>
@@ -5109,14 +5108,14 @@
     <string name="gesture_setting_on" msgid="3223448394997988591">"On"</string>
     <string name="gesture_setting_off" msgid="3444029475726294919">"Off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="65713754674288193">"Bootloader is already unlocked"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="8045017109714463041">"Connect to the Internet first"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="8045017109714463041">"Connect to the internet first"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="7425519481227423860">"Connect to the internet or contact your carrier"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"Unavailable on carrier-locked devices"</string>
     <string name="oem_lock_info_message" msgid="8843145669619429197">"Please restart the device to enable device protection feature."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="706230592123831676">"<xliff:g id="SIZE">%1$s</xliff:g> total made available\n\nLast ran on <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="6654581786741216382">"Instant Apps"</string>
+    <string name="web_action_enable_title" msgid="6654581786741216382">"Instant apps"</string>
     <string name="web_action_enable_summary" msgid="2658930257777545990">"Open links in apps, even if they’re not installed"</string>
-    <string name="web_action_section_title" msgid="994717569424234098">"Instant Apps"</string>
+    <string name="web_action_section_title" msgid="994717569424234098">"Instant apps"</string>
     <string name="instant_apps_settings" msgid="4280942494969957858">"Instant Apps preferences"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"Your storage is now being managed by the storage manager"</string>
@@ -5192,16 +5191,16 @@
     <string name="financed_privacy_install_apps" msgid="7381718005710210851">"Install apps from outside the Play Store"</string>
     <string name="financed_privacy_safe_mode" msgid="5362149445732602578">"Reboot your device into safe mode"</string>
     <string name="financed_privacy_multi_users" msgid="1727194928477613081">"Add multiple users to your device"</string>
-    <string name="financed_privacy_config_date_time" msgid="8567370445374984365">"Change date, time and time zones"</string>
-    <string name="financed_privacy_developer_options" msgid="7602001474669831672">"Use Developer options"</string>
+    <string name="financed_privacy_config_date_time" msgid="8567370445374984365">"Change date, time, and time zones"</string>
+    <string name="financed_privacy_developer_options" msgid="7602001474669831672">"Use developer options"</string>
     <string name="financed_privacy_credit_provider_capabilities_category" msgid="8737902277892987998">"Your credit provider can:"</string>
     <string name="financed_privacy_IMEI" msgid="1852413860963824799">"Access your IMEI number"</string>
     <string name="financed_privacy_factory_reset" msgid="8915355477801723433">"Factory reset your device"</string>
     <string name="financed_privacy_locked_mode_category" msgid="3708288398912647751">"If your device is locked, you can only use it to:"</string>
     <string name="financed_privacy_emergency_calls" msgid="1108183987142736497">"Make emergency calls"</string>
-    <string name="financed_privacy_system_info" msgid="4158031444108708927">"View system info, like date, time, network status and battery"</string>
+    <string name="financed_privacy_system_info" msgid="4158031444108708927">"View system info like date, time, network status, and battery"</string>
     <string name="financed_privacy_turn_on_off_device" msgid="3331566753152790571">"Turn your device on or off"</string>
-    <string name="financed_privacy_notifications" msgid="5932303271274089968">"View notifications and text messages"</string>
+    <string name="financed_privacy_notifications" msgid="5932303271274089968">"View notifications &amp; text messages"</string>
     <string name="financed_privacy_allowlisted_apps" msgid="8333040812194879963">"Access apps that are allowed by the credit provider"</string>
     <string name="financed_privacy_fully_paid_category" msgid="9221763928564246923">"Once you pay the full amount:"</string>
     <string name="financed_privacy_restrictions_removed" msgid="3182636815294595072">"All restrictions are removed from the device"</string>
@@ -5233,13 +5232,13 @@
     <string name="storage_videos" msgid="6117698226447251033">"Videos"</string>
     <string name="storage_audio" msgid="5994664984472140386">"Audio"</string>
     <string name="storage_apps" msgid="3564291603258795216">"Apps"</string>
-    <string name="storage_documents_and_other" msgid="3293689243732236480">"Documents and other"</string>
+    <string name="storage_documents_and_other" msgid="3293689243732236480">"Documents &amp; other"</string>
     <string name="storage_system" msgid="8472410119822911844">"System"</string>
-    <string name="storage_trash" msgid="2807138998886084856">"Bin"</string>
-    <string name="storage_trash_dialog_title" msgid="2296169576049935200">"Empty bin?"</string>
-    <string name="storage_trash_dialog_ask_message" msgid="8982602137242358798">"There are <xliff:g id="TOTAL">%1$s</xliff:g> of files in the bin. All items will be deleted forever, and you won’t be able to restore them."</string>
-    <string name="storage_trash_dialog_empty_message" msgid="7334670765528691400">"Bin is empty"</string>
-    <string name="storage_trash_dialog_confirm" msgid="1707723334982760436">"Empty bin"</string>
+    <string name="storage_trash" msgid="2807138998886084856">"Trash"</string>
+    <string name="storage_trash_dialog_title" msgid="2296169576049935200">"Empty trash?"</string>
+    <string name="storage_trash_dialog_ask_message" msgid="8982602137242358798">"There are <xliff:g id="TOTAL">%1$s</xliff:g> of files in the trash. All items will be deleted forever, and you won’t be able to restore them."</string>
+    <string name="storage_trash_dialog_empty_message" msgid="7334670765528691400">"Trash is empty"</string>
+    <string name="storage_trash_dialog_confirm" msgid="1707723334982760436">"Empty trash"</string>
     <string name="storage_size_large_alternate" msgid="7555149858858591495">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="7102720999351050601">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="7211888326013020857">"used"</string>
@@ -5252,28 +5251,28 @@
     <string name="app_info_storage_title" msgid="4076977173803093808">"Space used"</string>
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7595308061826307921">"Auto-fill service"</string>
+    <string name="autofill_app" msgid="7595308061826307921">"Autofill service"</string>
     <string name="autofill_passwords" msgid="6708057251459761083">"Passwords"</string>
     <plurals name="autofill_passwords_count" formatted="false" msgid="7715009165029452622">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> passwords</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> password</item>
     </plurals>
     <string name="autofill_keywords" msgid="8598763328489346438">"auto, fill, autofill, password"</string>
-    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
-    <string name="debug_autofill_category" msgid="5998163555428196185">"Auto-fill"</string>
+    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Make sure you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be autofilled."</string>
+    <string name="debug_autofill_category" msgid="5998163555428196185">"Autofill"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logging level"</string>
     <string name="autofill_max_partitions" msgid="7342195529574406366">"Max requests per session"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max visible datasets"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reset to default values"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Auto-fill developer options have been reset"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Autofill developer options have been reset"</string>
     <string name="location_category" msgid="3496759112306219062">"Location"</string>
     <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bar location indicator"</string>
     <string name="location_indicator_settings_description" msgid="2888022085372804021">"Show for all locations, including network and connectivity"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
-    <string name="input_method_category" msgid="2252659253631639005">"Input method"</string>
+    <string name="input_method_category" msgid="2252659253631639005">"Input Method"</string>
     <string name="stylus_handwriting" msgid="2154591374132794563">"Stylus handwriting"</string>
-    <string name="stylus_handwriting_summary" msgid="6333425895172696950">"When enabled, the current input method receives a stylus MotionEvent if an Editor is focused."</string>
+    <string name="stylus_handwriting_summary" msgid="6333425895172696950">"When enabled, current Input method receives stylus MotionEvent if an Editor is focused."</string>
     <string name="device_theme" msgid="5027604586494772471">"Device theme"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Network name"</string>
@@ -5290,20 +5289,20 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pause notifications to stay focused"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Feature not available"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"This feature has been turned off because it slows down your phone"</string>
-    <string name="show_first_crash_dialog" msgid="1696584857732637389">"Always show crash dialogue"</string>
-    <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Show dialogue every time an app crashes"</string>
+    <string name="show_first_crash_dialog" msgid="1696584857732637389">"Always show crash dialog"</string>
+    <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Show dialog every time an app crashes"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Select ANGLE enabled app"</string>
     <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"No ANGLE enabled application set"</string>
     <string name="angle_enabled_app_set" msgid="7811829383833353021">"ANGLE enabled application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Graphics driver preferences"</string>
+    <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Graphics Driver Preferences"</string>
     <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"Modify graphics driver settings"</string>
-    <string name="graphics_driver_footer_text" msgid="5123754522284046790">"When there are multiple graphics drivers, you can pick to use the updated graphics driver for apps installed on the device."</string>
+    <string name="graphics_driver_footer_text" msgid="5123754522284046790">"When there are multiple graphics drivers, you can pick to use the updated graphics driver for Apps installed on the device."</string>
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
-    <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
+    <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
-    <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
-    <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
+    <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System Graphics Driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
     <!-- no translation found for graphics_driver_all_apps_preference_values:1 (157748136905839375) -->
     <!-- no translation found for graphics_driver_all_apps_preference_values:2 (8104576549429294026) -->
@@ -5311,7 +5310,7 @@
     <!-- no translation found for graphics_driver_app_preference_values:1 (485288770206606512) -->
     <!-- no translation found for graphics_driver_app_preference_values:2 (5391218026495225599) -->
     <!-- no translation found for graphics_driver_app_preference_values:3 (2586045835780389650) -->
-    <string name="platform_compat_dashboard_title" msgid="1323980546791790236">"App compatibility changes"</string>
+    <string name="platform_compat_dashboard_title" msgid="1323980546791790236">"App Compatibility Changes"</string>
     <string name="platform_compat_dashboard_summary" msgid="4036546607938791337">"Toggle app compatibility changes"</string>
     <string name="platform_compat_default_enabled_title" msgid="8973137337738388024">"Default enabled changes"</string>
     <string name="platform_compat_default_disabled_title" msgid="3975847180953793602">"Default disabled changes"</string>
@@ -5352,14 +5351,14 @@
     <string name="battery_suggestion_title" product="default" msgid="4811554469047272537">"Improve phone\'s battery life"</string>
     <string name="battery_suggestion_summary" msgid="8186720080540016197"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="8293094715267769349">"Prevent ringing"</string>
-    <string name="gesture_prevent_ringing_title" msgid="5978577898997523581">"Press Power and Volume Up together to"</string>
+    <string name="gesture_prevent_ringing_title" msgid="5978577898997523581">"Press Power &amp; Volume Up together to"</string>
     <string name="gesture_prevent_ringing_sound_title" msgid="4529077822282099235">"Shortcut to prevent ringing"</string>
     <string name="prevent_ringing_option_vibrate" msgid="5456962289649581737">"Vibrate"</string>
     <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"Mute"</string>
     <string name="prevent_ringing_option_none" msgid="7776676007180834163">"Do nothing"</string>
     <string name="prevent_ringing_option_vibrate_summary" msgid="3435299885425754304">"Vibrate"</string>
     <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"Mute"</string>
-    <string name="prevent_ringing_option_unavailable_lpp_summary" msgid="8070356204398144241">"To enable, first change \'Press &amp; hold power button\' to the power menu."</string>
+    <string name="prevent_ringing_option_unavailable_lpp_summary" msgid="8070356204398144241">"To enable, first change \"Press &amp; hold power button\" to the power menu."</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Network details"</string>
     <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Devices"</string>
@@ -5382,9 +5381,9 @@
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="6419309630040697488">"Preferred network mode: GSM/WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="6419309630040697488">"Preferred network mode: GSM / WCDMA"</string>
     <string name="preferred_network_mode_cdma_summary" msgid="5735467143380764681">"Preferred network mode: CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_summary" msgid="1667358006735235626">"Preferred network mode: CDMA/EvDo"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="1667358006735235626">"Preferred network mode: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="6305930965673800101">"Preferred network mode: CDMA only"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="613903666107299289">"Preferred network mode: EvDo only"</string>
     <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="5643603478619124717">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
@@ -5393,13 +5392,13 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="1221806410911793222">"Preferred network mode: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary" msgid="8974263692041299883">"Preferred network mode: LTE/CDMA/EvDo/GSM/WCDMA"</string>
     <string name="preferred_network_mode_global_summary" msgid="817118763629102239">"Preferred network mode: Global"</string>
-    <string name="preferred_network_mode_lte_wcdma_summary" msgid="7326137039981934928">"Preferred network mode: LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="5105989927899481131">"Preferred network mode: LTE/GSM/UMTS"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="2364210682008525703">"Preferred network mode: LTE/CDMA"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="7326137039981934928">"Preferred network mode: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="5105989927899481131">"Preferred network mode: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="2364210682008525703">"Preferred network mode: LTE / CDMA"</string>
     <string name="preferred_network_mode_tdscdma_summary" msgid="796303916110624922">"Preferred network mode: TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="1465990745594594173">"Preferred network mode: TDSCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3771917510642642724">"Preferred network mode: LTE/TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="8906951876805688851">"Preferred network mode: TDSCDMA/GSM"</string>
+    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="1465990745594594173">"Preferred network mode: TDSCDMA / WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3771917510642642724">"Preferred network mode: LTE / TDSCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="8906951876805688851">"Preferred network mode: TDSCDMA / GSM"</string>
     <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="2264537129425897267">"Preferred network mode: LTE/GSM/TDSCDMA"</string>
     <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="2469046704847661521">"Preferred network mode: TDSCDMA/GSM/WCDMA"</string>
     <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="2276439307637315057">"Preferred network mode: LTE/TDSCDMA/WCDMA"</string>
@@ -5407,7 +5406,7 @@
     <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8918066490624875671">"Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
     <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="1059705864131001171">"Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
     <string name="preferred_network_mode_nr_only_summary" msgid="9153575102136218656">"Preferred network mode: NR only"</string>
-    <string name="preferred_network_mode_nr_lte_summary" msgid="4326679533556458480">"Preferred network mode: NR/LTE"</string>
+    <string name="preferred_network_mode_nr_lte_summary" msgid="4326679533556458480">"Preferred network mode: NR / LTE"</string>
     <string name="preferred_network_mode_nr_lte_cdma_evdo_summary" msgid="4030662583832600005">"Preferred network mode: NR/LTE/CDMA/EvDo"</string>
     <string name="preferred_network_mode_nr_lte_gsm_wcdma_summary" msgid="8327982533965785835">"Preferred network mode: NR/LTE/GSM/WCDMA"</string>
     <string name="preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary" msgid="7892233480076496041">"Preferred network mode: NR/LTE/CDMA/EvDo/GSM/WCDMA"</string>
@@ -5424,7 +5423,7 @@
     <string name="load_networks_progress" msgid="4717874401621250401">"Searching…"</string>
     <string name="register_on_network" msgid="2169662800750709709">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5756935665192962915">"Your SIM card doesn’t allow a connection to this network."</string>
-    <string name="connect_later" msgid="2330538069949281352">"Can’t connect to this network at the moment. Try again later."</string>
+    <string name="connect_later" msgid="2330538069949281352">"Can’t connect to this network right now. Try again later."</string>
     <string name="registration_done" msgid="1750434215698850123">"Registered on network."</string>
     <string name="select_automatically" msgid="2419752566747259155">"Automatically select network"</string>
     <string name="carrier_settings_title" msgid="6959295328730560529">"Carrier settings"</string>
@@ -5451,13 +5450,13 @@
     <string name="mobile_network_in_range" msgid="3528320750936028369">"In range"</string>
     <string name="mobile_network_not_in_range" msgid="5680896182395366584">"Not in range"</string>
     <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Add more"</string>
-    <string name="mobile_network_active_sim" msgid="6397581267971410039">"Active/SIM"</string>
-    <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Inactive/SIM"</string>
-    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Active/Downloaded SIM"</string>
-    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactive/Downloaded SIM"</string>
-    <string name="mobile_network_sim_name" msgid="3187192894150386537">"SIM name and colour"</string>
+    <string name="mobile_network_active_sim" msgid="6397581267971410039">"Active / SIM"</string>
+    <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Inactive / SIM"</string>
+    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Active / Downloaded SIM"</string>
+    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactive / Downloaded SIM"</string>
+    <string name="mobile_network_sim_name" msgid="3187192894150386537">"SIM name &amp; color"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Name"</string>
-    <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Colour (used by compatible apps)"</string>
+    <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Color (used by compatible apps)"</string>
     <string name="mobile_network_sim_name_rename" msgid="5967588549571582924">"Save"</string>
     <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Use SIM"</string>
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Off"</string>
@@ -5466,9 +5465,9 @@
     <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Switch to <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
     <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="CARRIER1">%1$s</xliff:g> won\'t cancel your <xliff:g id="CARRIER2">%2$s</xliff:g> service."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"Switch to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
-    <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Delete SIM"</string>
-    <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"Can’t delete SIM"</string>
-    <string name="mobile_network_erase_sim_error_dialog_body" msgid="6401922869095572710">"This SIM can’t be deleted due to an error.\n\nRestart your device and try again."</string>
+    <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Erase SIM"</string>
+    <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"Can’t erase SIM"</string>
+    <string name="mobile_network_erase_sim_error_dialog_body" msgid="6401922869095572710">"This SIM can’t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="preferred_network_mode_title" msgid="3083431168988535628">"Preferred network type"</string>
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
@@ -5488,8 +5487,8 @@
     <string name="roaming_alert_title" msgid="9052791521868787985">"Allow data roaming?"</string>
     <string name="roaming_check_price_warning" msgid="5876977438036791361">"Check with your network provider for pricing."</string>
     <string name="mobile_data_usage_title" msgid="2047864499317759728">"App data usage"</string>
-    <string name="mobile_network_mode_error" msgid="9222056129897416074">"Invalid network mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
-    <string name="mobile_network_apn_title" msgid="5582995550142073054">"Access point names"</string>
+    <string name="mobile_network_mode_error" msgid="9222056129897416074">"Invalid Network Mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+    <string name="mobile_network_apn_title" msgid="5582995550142073054">"Access Point Names"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
@@ -5501,7 +5500,7 @@
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
-    <string name="sim_action_switch_sub_dialog_mep_text" msgid="8348764755143679582">"You can use two SIMs at a time. To use <xliff:g id="CARRIER_NAME">%1$s</xliff:g>, turn off another SIM."</string>
+    <string name="sim_action_switch_sub_dialog_mep_text" msgid="8348764755143679582">"You can use 2 SIMs at a time. To use <xliff:g id="CARRIER_NAME">%1$s</xliff:g>, turn off another SIM."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_switch_sub_dialog_carrier_list_item_for_turning_off" msgid="5392037608705799522">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_switch_sub_dialog_info_outline_for_turning_off" msgid="1617619100229136888">"Turning off a SIM won’t cancel your service"</string>
@@ -5514,14 +5513,14 @@
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable carrier"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your carrier could not be disabled."</string>
-    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No, thanks\'."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use 2 SIMs?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
     <string name="sim_action_yes" msgid="8076556020131395515">"Yes"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
-    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No thanks"</string>
     <string name="sim_action_cancel" msgid="2668099867029610910">"Cancel"</string>
     <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
@@ -5535,26 +5534,26 @@
     <string name="switch_to_removable_notification_no_carrier_name" msgid="7384856964036215338">"Switched to another carrier"</string>
     <string name="network_changed_notification_text" msgid="2407908598496951243">"Your mobile network has changed"</string>
     <string name="dsds_notification_after_suw_title" msgid="3738898232310273982">"Set up your other SIM"</string>
-    <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"Choose your active SIM or use two SIMs at once"</string>
+    <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"Choose your active SIM or use 2 SIMs at once"</string>
     <string name="choose_sim_title" msgid="4804689675237716286">"Choose a number to use"</string>
     <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{1 number is available on this device, but only one can be used at a time}=2{2 numbers are available on this device, but only one can be used at a time}other{# numbers are available on this device, but only one can be used at a time}}"</string>
     <string name="choose_sim_activating" msgid="9035902671985449448">"Activating<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <string name="choose_sim_could_not_activate" msgid="2154564459842291617">"Couldn’t be activated at the moment"</string>
+    <string name="choose_sim_could_not_activate" msgid="2154564459842291617">"Couldn’t be activated right now"</string>
     <string name="choose_sim_item_summary_unknown" msgid="7854314795485227568">"Unknown number"</string>
     <string name="switch_sim_dialog_title" msgid="5407316878973237773">"Use <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
-    <string name="switch_sim_dialog_text" msgid="7530186862171635464">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> will be used for mobile data, calls and SMS."</string>
+    <string name="switch_sim_dialog_text" msgid="7530186862171635464">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> will be used for mobile data, calls, and SMS."</string>
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"No active SIMs available"</string>
-    <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"To use mobile data, call features and SMS at a later time, go to your network settings"</string>
+    <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"To use mobile data, call features, and SMS at a later time, go to your network settings"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"SIM card"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
-    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be canceled."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Erasing SIM…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Can\'t erase SIM"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"This SIM can\'t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
-    <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
+    <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure devices are turned on and available to connect."</string>
     <string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Try again"</string>
     <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Something came up. The application has cancelled the request to choose a device."</string>
     <string name="network_connection_connect_successful" msgid="2587314077675642476">"Connection successful"</string>
@@ -5571,10 +5570,10 @@
     <string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable in Airplane mode"</string>
     <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
     <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
-    <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
-    <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
+    <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in multi window"</string>
+    <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in multi window"</string>
     <string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
-    <string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always on"</string>
+    <string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always-on"</string>
     <string name="privacy_dashboard_title" msgid="6845403825611829558">"Privacy"</string>
     <string name="privacy_dashboard_summary" msgid="5775090172422786808">"Permissions, account activity, personal data"</string>
     <string name="privacy_controls_title" msgid="1383047169455206604">"Controls"</string>
@@ -5583,7 +5582,7 @@
     <string name="contextual_card_dismiss_confirm_message" msgid="6434344989238055188">"Remove this suggestion?"</string>
     <string name="contextual_card_removed_message" msgid="5755438207494260867">"Suggestion removed"</string>
     <string name="contextual_card_undo_dismissal_text" msgid="5200381837316691406">"Undo"</string>
-    <string name="low_storage_summary" msgid="1979492757417779718">"Storage is low. <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
+    <string name="low_storage_summary" msgid="1979492757417779718">"Storage is low. <xliff:g id="PERCENTAGE">%1$s</xliff:g> used - <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
     <string name="contextual_card_feedback_send" msgid="7409408664417908922">"Send feedback"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3186334562157665381">"Would you like to give us feedback on this suggestion?"</string>
     <string name="copyable_slice_toast" msgid="1008251852798990606">"<xliff:g id="COPY_CONTENT">%1$s</xliff:g> copied to clipboard."</string>
@@ -5603,10 +5602,10 @@
     <string name="media_output_panel_title" msgid="5920946795078065159">"Switch output"</string>
     <string name="media_output_panel_summary_of_playing_device" msgid="6998758947764222915">"Currently playing on <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="media_output_disconnected_status" msgid="5567111639832431865">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> (disconnected)"</string>
-    <string name="media_output_switch_error_text" msgid="603563475910236831">"Can’t switch. Tap to try again"</string>
+    <string name="media_output_switch_error_text" msgid="603563475910236831">"Can’t switch. Tap to try again."</string>
     <string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Important information"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"CONTINUE"</string>
-    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO, THANKS"</string>
+    <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NO THANKS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Location"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Your carrier may collect your location when you use this service for emergency calls.\n\nVisit your carrier’s privacy policy for details."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"You may lose access to any remaining time or data. Check with your provider before removing."</string>
@@ -5631,23 +5630,23 @@
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Can’t send MMS message"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tap to allow MMS messaging on <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> when mobile data is off"</string>
     <string name="enable_mms_notification_channel_title" msgid="1798206332620642108">"MMS message"</string>
-    <string name="sim_combination_warning_notification_title" msgid="1365401631492986487">"Problem with SIM combination"</string>
-    <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"Using <xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> may limit functionality. Tap to find out more."</string>
+    <string name="sim_combination_warning_notification_title" msgid="1365401631492986487">"Issue with SIM combination"</string>
+    <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"Using <xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> may limit functionality. Tap to learn more."</string>
     <string name="dual_cdma_sim_warning_notification_channel_title" msgid="1049161096896074364">"SIM combination"</string>
     <string name="work_policy_privacy_settings" msgid="2702644843505242596">"Your work policy info"</string>
     <string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"Settings managed by your IT admin"</string>
     <string name="track_frame_time_keywords" msgid="7885340257945922239">"GPU"</string>
     <string name="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
-    <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determines which app handles the bug report shortcut on your device."</string>
+    <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Determines which app handles the Bug Report shortcut on your device."</string>
     <string name="personal_profile_app_subtext" msgid="5586060806997067676">"Personal"</string>
     <string name="work_profile_app_subtext" msgid="5043419461440127879">"Work"</string>
     <string name="system_default_app_subtext" msgid="5212055189703164839">"System default"</string>
     <string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"This choice is no longer valid. Try again."</string>
     <string name="quick_controls_lower" msgid="6675573610027367819">"device controls"</string>
-    <string name="cards_passes_sentence" msgid="1866311782387946944">"Cards and passes"</string>
-    <string name="cards_passes_lower" msgid="2429722007109957877">"cards and passes"</string>
+    <string name="cards_passes_sentence" msgid="1866311782387946944">"Cards &amp; passes"</string>
+    <string name="cards_passes_lower" msgid="2429722007109957877">"cards &amp; passes"</string>
     <string name="power_menu_setting_name" msgid="2394440932633137229">"Press &amp; hold power button"</string>
-    <string name="power_menu_long_press_category_title" msgid="1051146091093775002">"Press &amp; hold the power button to access"</string>
+    <string name="power_menu_long_press_category_title" msgid="1051146091093775002">"Press &amp; hold power button to access"</string>
     <string name="power_menu_long_press_for_power_menu_title" msgid="477584639843663599">"Power menu"</string>
     <string name="power_menu_long_press_for_assistant_title" msgid="6557738348262616455">"Digital assistant"</string>
     <string name="power_menu_summary_long_press_for_assistant" msgid="32706459458422952">"Access digital assistant"</string>
@@ -5667,7 +5666,7 @@
     <string name="lockscreen_privacy_controls_summary" msgid="2769166101644452893">"Show controls for external devices from the lock screen"</string>
     <string name="lockscreen_trivial_controls_setting_toggle" msgid="8211063535536295676">"Control from locked device"</string>
     <string name="lockscreen_trivial_controls_summary" msgid="680581904143387225">"Control external devices without unlocking your phone or tablet if allowed by the device controls app"</string>
-    <string name="lockscreen_trivial_disabled_controls_summary" msgid="7593626010580689155">"To use, first turn on ‘Show device controls’"</string>
+    <string name="lockscreen_trivial_disabled_controls_summary" msgid="7593626010580689155">"To use, first turn on \"Show device controls\""</string>
     <string name="lockscreen_double_line_clock_summary" msgid="2916159550425093703">"Show double-line clock when available"</string>
     <string name="lockscreen_double_line_clock_setting_toggle" msgid="3408639316001688529">"Double-line clock"</string>
     <string name="rtt_settings_title" msgid="7049259598645966354"></string>
@@ -5676,17 +5675,17 @@
     <string name="rtt_settings_always_visible" msgid="2364173070088756238"></string>
     <string name="media_output_panel_stop_casting_button" msgid="6094875883164119035">"Stop casting"</string>
     <string name="volte_5G_limited_title" msgid="5908052268836750629">"Turn off VoLTE?"</string>
-    <string name="volte_5G_limited_text" msgid="7150583768725182345">"This also turns off your 5G connection.\nDuring a voice call, you can’t use the Internet and some apps may not work."</string>
-    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"When using two SIMs, this phone will be limited to 4G. "<annotation id="url">"Learn more"</annotation></string>
-    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"When using two SIMs, this tablet will be limited to 4G. "<annotation id="url">"Learn more"</annotation></string>
-    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"When using two SIMs, this device will be limited to 4G. "<annotation id="url">"Learn more"</annotation></string>
+    <string name="volte_5G_limited_text" msgid="7150583768725182345">"This also turns off your 5G connection.\nDuring a voice call, you can’t use the internet and some apps may not work."</string>
+    <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"When using 2 SIMs, this phone will be limited to 4G. "<annotation id="url">"Learn more"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"When using 2 SIMs, this tablet will be limited to 4G. "<annotation id="url">"Learn more"</annotation></string>
+    <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"When using 2 SIMs, this device will be limited to 4G. "<annotation id="url">"Learn more"</annotation></string>
     <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspend execution for cached apps"</string>
     <string name="blob_never_expires_text" msgid="7293376386620106623">"Never expires."</string>
     <string name="accessor_never_expires_text" msgid="4647624492147788340">"Lease never expires."</string>
-    <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
-    <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
-    <string name="allow_mock_modem" msgid="3832264806530479214">"Allow mock modem"</string>
-    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Allow this device to run mock modem service for instrumentation testing. Do not enable this during normal usage of the phone"</string>
+    <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on Settings"</string>
+    <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay Settings screens"</string>
+    <string name="allow_mock_modem" msgid="3832264806530479214">"Allow Mock Modem"</string>
+    <string name="allow_mock_modem_summary" msgid="9097416612748005374">"Allow this device to run Mock Modem service for instrumentation testing. Do not enable this during normal usage of the phone"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
     <string name="media_controls_resume_title" msgid="855076860336652370">"Pin media player"</string>
     <string name="media_controls_resume_description" msgid="3163482266454802097">"To quickly resume playback, media player stays open in Quick Settings"</string>
@@ -5702,8 +5701,8 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
-    <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"airplane, airplane-safe"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Calls &amp; SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"Wi‑Fi calling"</string>
     <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Make and receive calls over Wi‑Fi"</string>
     <string name="calls_sms_footnote" msgid="1003530944232362815">"With Wi‑Fi calling, calls are made and received over non‑carrier Wi‑Fi networks. "<annotation id="url">"Learn more"</annotation></string>
@@ -5717,15 +5716,15 @@
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
     <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte"</string>
-    <string name="turn_on_wifi" msgid="4868116014727533668">"Turn on Wi-Fi"</string>
+    <string name="turn_on_wifi" msgid="4868116014727533668">"Turn on Wi‑Fi"</string>
     <string name="turn_off_wifi" msgid="8861028501067400694">"Turn off Wi‑Fi"</string>
-    <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset your Internet?"</string>
+    <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset your internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"This will end your phone call"</string>
-    <string name="resetting_internet_text" msgid="6696779371800051806">"Resetting your Internet…"</string>
+    <string name="resetting_internet_text" msgid="6696779371800051806">"Resetting your internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
     <string name="networks_available" msgid="3299512933684383474">"Networks available"</string>
-    <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
+    <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect ethernet"</string>
     <string name="wifi_is_off" msgid="8308136482502734453">"Wi‑Fi is off"</string>
     <string name="tap_a_network_to_connect" msgid="8044777400224037875">"Tap a network to connect"</string>
     <string name="carrier_wifi_offload_title" msgid="7263365988016247722">"W+ connections"</string>
@@ -5742,7 +5741,7 @@
     <string name="default_active_sim_mobile_data" msgid="6798083892814045301">"mobile data"</string>
     <string name="wifi_scan_notify_message" msgid="1331238142061476869">"To improve device experience, apps and services can still scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services. You can change this in Wi‑Fi scanning settings."</string>
     <string name="wifi_scan_change" msgid="8438320311511852918">"Change"</string>
-    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+    <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
     <string name="mobile_data_no_connection" msgid="905897142426974030">"No connection"</string>
     <string name="mobile_data_off_summary" msgid="1884248776904165539">"Mobile data won\'t auto‑connect"</string>
@@ -5764,7 +5763,7 @@
     <string name="category_name_brightness" msgid="8520372392029305084">"Brightness"</string>
     <string name="category_name_lock_display" msgid="8310402558217129670">"Lock display"</string>
     <string name="category_name_appearance" msgid="8287486771764166805">"Appearance"</string>
-    <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
+    <string name="category_name_color" msgid="937514550918977151">"Color"</string>
     <string name="category_name_display_controls" msgid="7046581691184725216">"Other display controls"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
@@ -5773,40 +5772,40 @@
     <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"Use prevent ringing"</string>
     <string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Use Wi‑Fi hotspot"</string>
     <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Use app pinning"</string>
-    <string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use Developer options"</string>
+    <string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use developer options"</string>
     <string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Use print service"</string>
     <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Allow multiple users"</string>
     <string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Use wireless debugging"</string>
     <string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"Use graphics driver preferences"</string>
-    <string name="battery_saver_main_switch_title" msgid="5072135547489779352">"Use Battery Saver"</string>
+    <string name="battery_saver_main_switch_title" msgid="5072135547489779352">"Use battery saver"</string>
     <string name="do_not_disturb_main_switch_title_on" msgid="6965566556539821313">"Turn off now"</string>
     <string name="do_not_disturb_main_switch_title_off" msgid="7088088515823752545">"Turn on now"</string>
     <string name="night_light_main_switch_title" msgid="3428298022467805219">"Use Night Light"</string>
     <string name="nfc_main_switch_title" msgid="6295839988954817432">"Use NFC"</string>
-    <string name="adaptive_battery_main_switch_title" msgid="3127477920505485813">"Use Adaptive Battery"</string>
+    <string name="adaptive_battery_main_switch_title" msgid="3127477920505485813">"Use adaptive battery"</string>
     <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"Use adaptive brightness"</string>
     <string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"Use Wi‑Fi calling"</string>
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
-    <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
-    <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
-    <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart forwarding disabled"</string>
-    <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call settings"</string>
-    <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating settings…"</string>
-    <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call settings error"</string>
+    <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart Forwarding"</string>
+    <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart Forwarding Enabled"</string>
+    <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart Forwarding Disabled"</string>
+    <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call Settings"</string>
+    <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating Settings..."</string>
+    <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call Settings error"</string>
     <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Network or SIM card error."</string>
-    <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM is not activated."</string>
-    <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter phone numbers"</string>
-    <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
+    <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim is not activated."</string>
+    <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter Phone numbers"</string>
+    <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter Phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
     <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
     <string name="enable_2g_summary" msgid="2794534052372565914">"2G is less secure, but may improve your connection in some locations. For emergency calls, 2G is always allowed."</string>
     <string name="enable_2g_summary_disabled_carrier" msgid="8141118453219482762">"<xliff:g id="CARRIER_NAME_2G">%1$s</xliff:g> requires 2G to be available"</string>
-    <string name="app_info_all_services_label" msgid="3600929226735860271">"All services"</string>
+    <string name="app_info_all_services_label" msgid="3600929226735860271">"All Services"</string>
     <string name="show_clip_access_notification" msgid="7782300987639778542">"Show clipboard access"</string>
-    <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Show a message when apps access text, images or other content that you’ve copied"</string>
+    <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Show a message when apps access text, images, or other content you’ve copied"</string>
     <string name="all_apps" msgid="3054120149509114789">"All apps"</string>
-    <string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"Don\'t allow"</string>
+    <string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"Don’t allow"</string>
     <string name="uwb_settings_title" msgid="8578498712312002231">"Ultra-Wideband (UWB)"</string>
     <string name="uwb_settings_summary" msgid="3074271396764672268">"Helps identify the relative position of nearby devices that have UWB"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Turn off Airplane mode to use UWB"</string>
@@ -5817,7 +5816,7 @@
     <string name="mic_toggle_description" msgid="484139688645092237">"For apps and services. If this setting is off, microphone data may still be shared when you call an emergency number."</string>
     <string name="previous_page_content_description" msgid="6438292457923282991">"Previous"</string>
     <string name="next_page_content_description" msgid="1641835099813416294">"Next"</string>
-    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Colour preview"</string>
+    <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Color preview"</string>
     <string name="bluetooth_sim_card_access_notification_title" msgid="5217037846900908318">"SIM card access request"</string>
     <string name="bluetooth_sim_card_access_notification_content" msgid="6759306429895300286">"A device wants to access your SIM card. Tap for details."</string>
     <string name="bluetooth_sim_card_access_dialog_title" msgid="4486768729352090174">"Allow access to SIM card?"</string>
@@ -5828,57 +5827,57 @@
     <string name="bluetooth_connect_access_dialog_content" msgid="4336436466468405850">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to connect to this phone.\n\nYou haven’t connected to <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> before."</string>
     <string name="bluetooth_connect_access_dialog_negative" msgid="4944672755226375059">"Don’t connect"</string>
     <string name="bluetooth_connect_access_dialog_positive" msgid="3630561675207269710">"Connect"</string>
-    <string name="tare_settings" msgid="3788654800004869077">"TARE settings"</string>
+    <string name="tare_settings" msgid="3788654800004869077">"TARE Settings"</string>
     <string name="tare_on" msgid="2386073225978684535">"On"</string>
     <string name="tare_off" msgid="6305694402929756726">"Off"</string>
-    <string name="tare_revert" msgid="3855325741125236638">"Revert to default settings"</string>
+    <string name="tare_revert" msgid="3855325741125236638">"Revert to Default Settings"</string>
     <string name="tare_settings_reverted_toast" msgid="8189887409285176731">"Settings reverted to default."</string>
-    <string name="tare_max_satiated_balance" msgid="3914973999573150340">"Maximum satiated balance"</string>
+    <string name="tare_max_satiated_balance" msgid="3914973999573150340">"Maximum Satiated Balance"</string>
     <string name="tare_balances" msgid="731881382594747961">"Balances"</string>
-    <string name="tare_consumption_limits" msgid="3230949387874396382">"Consumption limits"</string>
-    <string name="tare_initial_consumption_limit" msgid="2921646306374048384">"Initial consumption limit"</string>
-    <string name="tare_hard_consumption_limit" msgid="7977885116447608016">"Maximum consumption limit"</string>
+    <string name="tare_consumption_limits" msgid="3230949387874396382">"Consumption Limits"</string>
+    <string name="tare_initial_consumption_limit" msgid="2921646306374048384">"Initial Consumption Limit"</string>
+    <string name="tare_hard_consumption_limit" msgid="7977885116447608016">"Maximum Consumption Limit"</string>
     <string name="tare_modifiers" msgid="8919975635360280820">"Modifiers"</string>
-    <string name="tare_actions_ctp" msgid="5110104015354916401">"Actions (cost to produce)"</string>
-    <string name="tare_actions_base_price" msgid="3300967942666376589">"Actions (base price)"</string>
+    <string name="tare_actions_ctp" msgid="5110104015354916401">"Actions (Cost to Produce)"</string>
+    <string name="tare_actions_base_price" msgid="3300967942666376589">"Actions (Base Price)"</string>
     <string name="tare_rewards_instantaneous" msgid="8358683519945340874">"Rewards per single event"</string>
     <string name="tare_rewards_ongoing" msgid="7657030286658143416">"Rewards per second of event duration"</string>
-    <string name="tare_rewards_max" msgid="5283055625642837010">"Maximum rewards per day"</string>
-    <string name="tare_top_activity" msgid="7266560655483385757">"Top activity"</string>
-    <string name="tare_notification_seen" msgid="7829963536020087742">"Notification seen"</string>
-    <string name="tare_notification_seen_15_min" msgid="832174185809497764">"Notification seen within 15 minutes"</string>
-    <string name="tare_notification_interaction" msgid="3806204222322830129">"Notification interaction"</string>
-    <string name="tare_widget_interaction" msgid="2260701564089214184">"Widget interaction"</string>
-    <string name="tare_other_interaction" msgid="8069163421115212751">"Other user interaction"</string>
-    <string name="tare_job_max_start" msgid="1586399578665940836">"Job max start"</string>
-    <string name="tare_job_max_running" msgid="2897217372986518495">"Job max running"</string>
-    <string name="tare_job_high_start" msgid="7464143754932031022">"Job high start"</string>
-    <string name="tare_job_high_running" msgid="6541171046405088669">"Job high running"</string>
-    <string name="tare_job_default_start" msgid="6744427210148953151">"Job default start"</string>
-    <string name="tare_job_default_running" msgid="8429081804128945217">"Job default running"</string>
-    <string name="tare_job_low_start" msgid="4605440035856891746">"Job low start"</string>
-    <string name="tare_job_low_running" msgid="831668616902849604">"Job low running"</string>
-    <string name="tare_job_min_start" msgid="6508233901992538188">"Job min start"</string>
-    <string name="tare_job_min_running" msgid="6167128996320622604">"Job min running"</string>
-    <string name="tare_job_timeout_penalty" msgid="7644332836795492506">"Job timeout penalty"</string>
-    <string name="tare_min_balance_exempted" msgid="6693710075762973485">"Minimum satiated balance (exempted)"</string>
-    <string name="tare_min_balance_headless_app" msgid="6906353766678577244">"Minimum satiated balance (headless system app)"</string>
-    <string name="tare_min_balance_other_app" msgid="3404774196832506476">"Minimum satiated balance (remaining apps)"</string>
+    <string name="tare_rewards_max" msgid="5283055625642837010">"Maximum Rewards Per Day"</string>
+    <string name="tare_top_activity" msgid="7266560655483385757">"Top Activity"</string>
+    <string name="tare_notification_seen" msgid="7829963536020087742">"Notification Seen"</string>
+    <string name="tare_notification_seen_15_min" msgid="832174185809497764">"Notification Seen Within 15 Minutes"</string>
+    <string name="tare_notification_interaction" msgid="3806204222322830129">"Notification Interaction"</string>
+    <string name="tare_widget_interaction" msgid="2260701564089214184">"Widget Interaction"</string>
+    <string name="tare_other_interaction" msgid="8069163421115212751">"Other User Interaction"</string>
+    <string name="tare_job_max_start" msgid="1586399578665940836">"Job Max Start"</string>
+    <string name="tare_job_max_running" msgid="2897217372986518495">"Job Max Running"</string>
+    <string name="tare_job_high_start" msgid="7464143754932031022">"Job High Start"</string>
+    <string name="tare_job_high_running" msgid="6541171046405088669">"Job High Running"</string>
+    <string name="tare_job_default_start" msgid="6744427210148953151">"Job Default Start"</string>
+    <string name="tare_job_default_running" msgid="8429081804128945217">"Job Default Running"</string>
+    <string name="tare_job_low_start" msgid="4605440035856891746">"Job Low Start"</string>
+    <string name="tare_job_low_running" msgid="831668616902849604">"Job Low Running"</string>
+    <string name="tare_job_min_start" msgid="6508233901992538188">"Job Min Start"</string>
+    <string name="tare_job_min_running" msgid="6167128996320622604">"Job Min Running"</string>
+    <string name="tare_job_timeout_penalty" msgid="7644332836795492506">"Job Timeout Penalty"</string>
+    <string name="tare_min_balance_exempted" msgid="6693710075762973485">"Minimum Satiated Balance (Exempted)"</string>
+    <string name="tare_min_balance_headless_app" msgid="6906353766678577244">"Minimum Satiated Balance (Headless System App)"</string>
+    <string name="tare_min_balance_other_app" msgid="3404774196832506476">"Minimum Satiated Balance (Remaining Apps)"</string>
   <string-array name="tare_modifiers_subfactors">
     <item msgid="3325940509857535498">"Charging"</item>
     <item msgid="658627268149681677">"Doze"</item>
     <item msgid="1599558140284643834">"Power Save Mode"</item>
-    <item msgid="588427840913221601">"Process state"</item>
+    <item msgid="588427840913221601">"Process State"</item>
   </string-array>
     <string name="tare_dialog_confirm_button_title" msgid="9179397559760203348">"Confirm"</string>
     <string name="dream_preview_button_title" msgid="6637456541851795952">"Preview"</string>
     <string name="dream_picker_category" msgid="7726447836872744867">"Choose a screen saver"</string>
     <string name="dream_complications_toggle_title" msgid="4273232303027449163">"Show additional information"</string>
-    <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"Display things like the time, weather or other information on the screen saver"</string>
+    <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"Display things like the time, weather, or other information on the screen saver"</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"More settings"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"Choose your screen saver"</string>
     <string name="dream_setup_description" msgid="7508547154038580296">"Choose what you’ll see on your screen when your tablet is docked. Your device may use more energy when a screen saver is used."</string>
-    <string name="customize_button_title" msgid="1110284655990203359">"Customise"</string>
+    <string name="customize_button_title" msgid="1110284655990203359">"Customize"</string>
     <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A reboot is required to enable freeform support."</string>
     <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"A reboot is required to force desktop mode on secondary displays."</string>
     <string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reboot now"</string>
@@ -5888,7 +5887,7 @@
     <string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"Head tracking"</string>
     <string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"Audio changes as you move your head to sound more natural"</string>
     <string name="ingress_rate_limit_title" msgid="2106694002836274350">"Network download rate limit"</string>
-    <string name="ingress_rate_limit_summary" msgid="1097811019742438371">"Configure the network bandwidth ingress rate limit which is applied to all networks that provide Internet connectivity."</string>
+    <string name="ingress_rate_limit_summary" msgid="1097811019742438371">"Configure the network bandwidth ingress rate limit which is applied to all networks that provide internet connectivity."</string>
     <string name="ingress_rate_limit_dialog_title" msgid="5359461052422633789">"Configure network download rate limit"</string>
     <string name="ingress_rate_limit_no_limit_entry" msgid="8741098826008012163">"No limit"</string>
     <string name="bluetooth_broadcast_dialog_title" msgid="9172775308463135884">"Broadcast"</string>
@@ -5903,6 +5902,6 @@
     <string name="find_broadcast_password_dialog_title" msgid="3176988702535737484">"Enter password"</string>
     <string name="find_broadcast_password_dialog_connection_error" msgid="47873617983439400">"Can’t connect. Try again."</string>
     <string name="find_broadcast_password_dialog_password_error" msgid="243855327674765">"Wrong password"</string>
-    <string name="bt_le_audio_scan_qr_code_scanner" msgid="7614569515419813053">"To start listening, centre the QR code below"</string>
+    <string name="bt_le_audio_scan_qr_code_scanner" msgid="7614569515419813053">"To start listening, center the QR code below"</string>
     <string name="bt_le_audio_qr_code_is_not_valid_format" msgid="7821837654128137901">"QR code isn\'t a valid format"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index f8723b8..278609d 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Never"</item>
-    <item msgid="5065465585332446709">"After one minute"</item>
-    <item msgid="622807566366131941">"After five minutes"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e23876a..fba1ded 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Enrolled <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps or approve a purchase"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Now you can use your fingerprint to unlock your device or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Unlock only when screen is on"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"The screen must be on before you can unlock with your fingerprint. This makes accidental unlocking less likely."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Screen, unlock"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"History details"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Battery usage"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"View usage for past 24 hours"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"View usage from last full charge"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"View usage since last full charge"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"App battery usage"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Battery usage"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Since full charge"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Manage battery usage"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfrom last full charge"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nsince last full charge"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor past 24 hours"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total less than a minute from last full charge"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total less than a minute since last full charge"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total less than a minute for past 24 hr"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Background less than a minute from last full charge"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Background less than a minute since last full charge"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Background less than a minute for past 24 hr"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Background less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> total from last full charge"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> total since last full charge"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> total for past 24 hr"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> total for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> background from last full charge"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> background since last full charge"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> background for past 24 hr"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> background for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfrom last full charge"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nsince last full charge"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfor past 24 hours"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> total • background less than a minute\nfor <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"No usage from last full charge"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"No usage since last full charge"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"No usage for past 24 hr"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Other users"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lock screen settings"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Add users from lock screen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Switch to admin user when docked"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Delete this user?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remove this profile?"</string>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index f8723b8..278609d 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Never"</item>
-    <item msgid="5065465585332446709">"After one minute"</item>
-    <item msgid="622807566366131941">"After five minutes"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4995d7b..f0fd28d 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Enrolled <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enrolling fingerprint <xliff:g id="PERCENTAGE">%d</xliff:g> per cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps or approve a purchase"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Now you can use your fingerprint to unlock your tablet or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Now you can use your fingerprint to unlock your device or verify that it’s you, like when you sign in to apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Now you can use your fingerprint to unlock your phone or verify that it’s you, like when you sign in to apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Unlock only when screen is on"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"The screen must be on before you can unlock with your fingerprint. This makes accidental unlocking less likely."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Screen, unlock"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"History details"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Battery usage"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"View usage for past 24 hours"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"View usage from last full charge"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"View usage since last full charge"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"App battery usage"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Battery usage"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Since full charge"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Manage battery usage"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfrom last full charge"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nsince last full charge"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor past 24 hours"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> total • <xliff:g id="TIME_1">^2</xliff:g> background\nfor <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total less than a minute from last full charge"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total less than a minute since last full charge"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total less than a minute for past 24 hr"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Background less than a minute from last full charge"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Background less than a minute since last full charge"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Background less than a minute for past 24 hr"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Background less than a minute for <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> total from last full charge"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> total since last full charge"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> total for past 24 hr"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> total for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> background from last full charge"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> background since last full charge"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> background for past 24 hr"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> background for <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfrom last full charge"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nsince last full charge"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> total • background less than a minute\nfor past 24 hours"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> total • background less than a minute\nfor <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"No usage from last full charge"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"No usage since last full charge"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"No usage for past 24 hr"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Other users"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lock screen settings"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Add users from lock screen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Switch to admin user when docked"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Delete this user?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remove this profile?"</string>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 72746af..048ccd1 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -586,9 +586,9 @@
     <item msgid="2373999996715432397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎0‎‏‎‎‏‎"</item>
     <item msgid="5305176997036663262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎1‎‏‎‎‏‎"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎Never‎‏‎‎‏‎"</item>
-    <item msgid="5065465585332446709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎After 1 minute‎‏‎‎‏‎"</item>
-    <item msgid="622807566366131941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎After 5 minutes‎‏‎‎‏‎"</item>
+  <string-array name="switch_to_dock_user_when_docked_timeout_entries">
+    <item msgid="3211660022507486536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎Never‎‏‎‎‏‎"</item>
+    <item msgid="7025253383416830453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎After 1 minute‎‏‎‎‏‎"</item>
+    <item msgid="1574040255478150028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎After 5 minutes‎‏‎‎‏‎"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 4cb0cb6..0bfe89d 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -588,10 +588,9 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎Enrolled ‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%d</xliff:g>‎‏‎‎‏‏‏‎ percent‎‏‎‎‏‎"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎Enrolling fingerprint ‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%d</xliff:g>‎‏‎‎‏‏‏‎ percent‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎Fingerprint added‎‏‎‎‏‎"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎Now you can use your fingerprint to unlock your tablet or verify it’s you, like when you sign in to apps or approve a purchase‎‏‎‎‏‎"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎Now you can use your fingerprint to unlock your tablet or verify it’s you, like when you sign in to apps‎‏‎‎‏‎"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎Now you can use your fingerprint to unlock your device or verify it’s you, like when you sign in to apps‎‏‎‎‏‎"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎Now you can use your fingerprint to unlock your phone or verify it’s you, like when you sign in to apps‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="6064618417107305796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎Now you can use your fingerprint to unlock your tablet or verify it’s you, like when you sign in to apps or approve a purchase‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="1948980056333872057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎Now you can use your fingerprint to unlock your device or verify it’s you, like when you sign in to apps or approve a purchase‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="3084541878035403475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎Now you can use your fingerprint to unlock your phone or verify it’s you, like when you sign in to apps or approve a purchase‎‏‎‎‏‎"</string>
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎Unlock only when screen is on‎‏‎‎‏‎"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎The screen must be on before you can unlock with your fingerprint. This makes accidental unlocking less likely.‎‏‎‎‏‎"</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎Screen, Unlock‎‏‎‎‏‎"</string>
@@ -2809,7 +2808,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎History details‎‏‎‎‏‎"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎Battery usage‎‏‎‎‏‎"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎View usage for past 24 hours‎‏‎‎‏‎"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎View usage from last full charge‎‏‎‎‏‎"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎View usage since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎App battery usage‎‏‎‎‏‎"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎Use details‎‏‎‎‏‎"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎Adjust power use‎‏‎‎‏‎"</string>
@@ -2990,25 +2989,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎Battery usage‎‏‎‎‏‎"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎Since full charge‎‏‎‎‏‎"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎Manage battery usage‎‏‎‎‏‎"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ total • ‎‏‎‎‏‏‎<xliff:g id="TIME_1">^2</xliff:g>‎‏‎‎‏‏‏‎ background‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ total • ‎‏‎‎‏‏‎<xliff:g id="TIME_1">^2</xliff:g>‎‏‎‎‏‏‏‎ background‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ total • ‎‏‎‎‏‏‎<xliff:g id="TIME_1">^2</xliff:g>‎‏‎‎‏‏‏‎ background‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ total • ‎‏‎‎‏‏‎<xliff:g id="TIME_1">^2</xliff:g>‎‏‎‎‏‏‏‎ background‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎for ‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD">^3</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎Total less than a minute from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎Total less than a minute since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎Total less than a minute for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎Total less than a minute for ‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎Background less than a minute from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎Background less than a minute since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎Background less than a minute for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎Background less than a minute for ‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ total from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ total since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ total for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ total for ‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD">^2</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ background from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ background since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ background for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ background for ‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD">^2</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ total • background less than a minute‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ total • background less than a minute‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="TIME">^1</xliff:g>‎‏‎‎‏‏‏‎ total • background less than a minute‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="TIME_0">^1</xliff:g>‎‏‎‎‏‏‏‎ total • background less than a minute‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎for ‎‏‎‎‏‏‎<xliff:g id="TIME_PERIOD">^2</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎No usage from last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎No usage since last full charge‎‏‎‎‏‎"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎No usage for past 24 hr‎‏‎‎‏‎"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎Other users‎‏‎‎‏‎"</string>
@@ -3488,7 +3487,7 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎Delete ‎‏‎‎‏‏‎<xliff:g id="USER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ from this device‎‏‎‎‏‎"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎Lock screen settings‎‏‎‎‏‎"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎Add users from lock screen‎‏‎‎‏‎"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎Switch to admin user when docked‎‏‎‎‏‎"</string>
+    <string name="switch_to_dock_user_when_docked" msgid="2324395443311905635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎Switch to admin user when docked‎‏‎‎‏‎"</string>
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎Delete yourself?‎‏‎‎‏‎"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎Delete this user?‎‏‎‎‏‎"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎Remove this profile?‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 59e8782..b06eb9a 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nunca"</item>
-    <item msgid="5065465585332446709">"Después de 1 minuto"</item>
-    <item msgid="622807566366131941">"Después de 5 minutos"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 651eee0..f70c576 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -590,10 +590,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Se agregó la huella dactilar"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Ahora puedes usar tu huella dactilar para desbloquear la tablet o verificar tu identidad, como cuando accedes a apps o apruebas compras."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Ahora puedes usar tu huella dactilar para desbloquear la tablet o verificar tu identidad, como cuando accedes a apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Ahora puedes usar tu huella dactilar para desbloquear el dispositivo o verificar tu identidad, como cuando accedes a apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Ahora puedes usar tu huella dactilar para desbloquear el teléfono o verificar tu identidad, como cuando accedes a apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloquear solo cuando la pantalla está encendida"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"La pantalla debe estar encendida antes de que puedas desbloquearla con la huella dactilar. De este modo, el desbloqueo accidental es menos probable."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Pantalla, desbloqueo"</string>
@@ -1521,8 +1523,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"No disponible cuando se activa modo hora de dormir"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Usar protector de pantalla"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Mientras se carga o está conectado"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Mientras está conectado y cargando"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Mientras se carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Cuando está conectado"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nunca"</string>
@@ -2812,7 +2813,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalles del historial"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Uso de batería"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Ver uso de las últimas 24 horas"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Ver uso desde la última carga completa"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Ver uso desde la última carga completa"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Uso de batería de la app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar el uso de energía"</string>
@@ -2993,25 +2994,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Uso de la batería"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Desde la última carga completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Administrar el uso de la batería"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndesde la última carga completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndesde la última carga completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\nen las últimas 24 h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\nen el período de <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Menos de un minuto en total desde la última carga completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Menos de un minuto en total desde la última carga completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Menos de un minuto en total durante las últimas 24 h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Menos de un minuto en total en el periodo de <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menos de un minuto en segundo plano desde la última carga completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menos de un minuto en segundo plano desde la última carga completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menos de un minuto en segundo plano durante las últimas 24 horas"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menos de un minuto en segundo plano en el período de <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> en total desde la última carga completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> en total desde la última carga completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> en total durante las últimas 24 h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> en total en el periodo de <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> en segundo plano desde la última carga completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> en segundo plano desde la última carga completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> en segundo plano durante las últimas 24 horas"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> en segundo plano en el período de <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> en total • menos de un minuto en segundo plano\ndesde la última carga completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> en total • menos de un minuto en segundo plano\ndesde la última carga completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> en total • menos de un minuto en segundo\nplano durante las últimas 24 h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> en total • menos de un minuto en segundo plano\nen el período de <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Se se usó desde la última carga completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Sin uso desde la última carga completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Sin uso durante las últimas 24 h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Otros usuarios"</string>
@@ -3491,7 +3492,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Borrar a <xliff:g id="USER_NAME">%1$s</xliff:g> del disp."</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Configuración de pantalla bloqueada"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Agregar usuarios desde la pantalla de bloqueo"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Cambiar a usuario administrador cuando se conecta"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"¿Deseas borrarte a ti mismo?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"¿Borrar este usuario?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"¿Eliminar este perfil?"</string>
@@ -3836,7 +3838,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Activar los sonidos"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitulado instantáneo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitular automáticamente"</string>
-    <string name="spatial_audio_speaker" msgid="9145233652433523302">"Altavoz del teléfono"</string>
+    <string name="spatial_audio_speaker" msgid="9145233652433523302">"Bocina del teléfono"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Auriculares con cable"</string>
     <string name="spatial_audio_text" msgid="8201387855375146000">"El audio del contenido multimedia compatible se hace más envolvente"</string>
     <string name="spatial_summary_off" msgid="8272678804629774378">"No"</string>
@@ -4204,8 +4206,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Como lo solicitaste, Android bloquea las notificaciones de esta app para que no se muestren en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Como lo solicitaste, Android bloquea esta categoría de notificaciones para que no se muestren en el dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Como lo solicitaste, Android bloquea este grupo de notificaciones para que no se muestren en el dispositivo"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Esta app no envía notificaciones"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Categorías"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Otros"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 1541e4b..70a6f85 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nunca"</item>
-    <item msgid="5065465585332446709">"Tras 1 minuto"</item>
-    <item msgid="622807566366131941">"Tras 5 minutos"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fe27921b..5751fd0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Tu modelo facial se eliminará de forma permanente y segura.\n\nUna vez eliminado, necesitarás tu PIN, patrón o contraseña para desbloquear tu teléfono."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Usa Desbloqueo facial para desbloquear el teléfono"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Huella digital"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Al usar Desbloqueo con huella digital"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Huella del trabajo"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Administrar huellas"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Usar huella para"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Registro al <xliff:g id="PERCENTAGE">%d</xliff:g> por ciento"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registro de la huella digital al <xliff:g id="PERCENTAGE">%d</xliff:g> por ciento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Huella digital añadida"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Ahora puedes desbloquear tu tablet o verificar tu identidad con tu huella digital (por ejemplo, para iniciar sesión en aplicaciones o aprobar compras)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Ahora puedes usar tu huella digital para desbloquear tu tablet o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Ahora puedes usar tu huella digital para desbloquear tu dispositivo o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Ahora puedes usar tu huella digital para desbloquear tu teléfono o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones)"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloquear solo cuando la pantalla esté encendida"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"La pantalla debe estar encendida para poder desbloquearla con la huella digital. Así, es menos probable que haya desbloqueos accidentales."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Pantalla, desbloqueo"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Más tarde"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Levanta el dedo y toca de nuevo"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Coloca el dedo de lado en el sensor, mantenlo pulsado y después gíralo para colocar el otro lado"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"No disponible con el modo Descanso activado"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Usar salvapantallas"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Durante la carga o en una base"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Mientras esté cargándose en la base"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Con el dispositivo en una base"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nunca"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalles del historial"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Uso de batería"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Consulta el uso durante las últimas 24 horas"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Consulta el uso desde la última carga de la batería"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Uso desde la última carga completa"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Uso de batería de la aplicación"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Cómo reducir el uso de la batería"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Uso de batería"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Desde la carga completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gestionar uso de la batería"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndesde la última carga completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndesde la última carga completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndurante las últimas 24 horas"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndurante <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Menos de 1 minuto en total desde la última carga completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Menos de 1 minuto en total desde la última carga completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Menos de 1 minuto en total durante las últimas 24 horas"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Menos de un minuto en total entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menos de 1 minuto en segundo plano desde la última carga completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menos de 1 minuto en segundo plano desde la última carga completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menos de 1 minuto en segundo plano durante las últimas 24 horas"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menos de 1 minuto en segundo plano entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> en total desde la última carga completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> en total desde la última carga completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> en total durante las últimas 24 horas"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> en total entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> en segundo plano desde la última carga completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> en segundo plano desde la última carga completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> en segundo plano durante las últimas 24 horas"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> en segundo plano entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> en total • menos de 1 minuto en segundo plano\ndesde la última carga completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> en total • menos de 1 minuto en segundo plano\ndesde la última carga completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> en total • menos de 1 minuto en segundo plano\ndurante las últimas 24 horas"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> en total • menos de 1 minuto en segundo plano\ndurante <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Sin uso desde la última carga completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Ningún uso desde la última carga completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Sin uso durante las últimas 24 horas"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Otros usuarios"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> de este dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Ajustes de pantalla de bloqueo"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Añadir usuarios desde la pantalla de bloqueo"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Cambiar al usuario administrador al conectarse"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"¿Eliminarte a ti mismo?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"¿Eliminar este usuario?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"¿Quitar este perfil?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Por petición tuya, Android está bloqueando las notificaciones de esta aplicación para que no se muestren en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Por petición tuya, Android está bloqueando esta categoría de notificaciones para que no se muestren en el dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Por petición tuya, Android está bloqueando este grupo de notificaciones para que no se muestren en el dispositivo"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Esta aplicación no envía notificaciones"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Categorías"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Otros"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -5883,7 +5880,7 @@
     <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"Muestra información como la hora, el tiempo u otros datos en el salvapantallas"</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"Más ajustes"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"Elegir el salvapantallas"</string>
-    <string name="dream_setup_description" msgid="7508547154038580296">"Elige lo que quieres ver en tu pantalla cuando tu tablet no está conectado. Es posible que el dispositivo gaste más energía cuando use el salvapantallas."</string>
+    <string name="dream_setup_description" msgid="7508547154038580296">"Elige lo que quieres ver en tu pantalla cuando tu tablet está conectado. Es posible que el dispositivo gaste más energía si se usa un salvapantallas."</string>
     <string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
     <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Debes reiniciar para habilitar el formato libre."</string>
     <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Debes reiniciar para forzar el modo Escritorio en pantallas secundarias."</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index e2a9606..fa0703e 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Mitte kunagi"</item>
-    <item msgid="5065465585332446709">"1 minuti pärast"</item>
-    <item msgid="622807566366131941">"5 minuti pärast"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 091c74c..68f6c95 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Teie näomudel kustutatakse jäädavalt ja turvaliselt.\n\nPärast kustutamist vajate telefoni avamiseks PIN-koodi, mustrit või parooli."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Kasutage oma telefoni avamiseks näoga avamise funktsiooni"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Sõrmejälg"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Sõrmejäljega avamist kasutades"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Sõrmejälg töö jaoks"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Sõrmejälgede haldamine"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Sõrmej. kasutatakse:"</string>
@@ -595,16 +594,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sõrmejälg on lisatud"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Nüüd saate tahvelarvuti avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel või ostu kinnitamisel) oma sõrmejälge kasutada."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Nüüd saate tahvelarvuti avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel) oma sõrmejälge kasutada."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Nüüd saate seadme avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel) oma sõrmejälge kasutada."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Nüüd saate telefoni avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel) oma sõrmejälge kasutada."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="6064618417107305796">"Nüüd saate tahvelarvuti avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel või ostude kinnitamisel) oma sõrmejälge kasutada."</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="1948980056333872057">"Nüüd saate seadme avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel või ostude kinnitamisel) oma sõrmejälge kasutada."</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="3084541878035403475">"Nüüd saate telefoni avamiseks või oma isiku kinnitamiseks (nt rakendustesse sisselogimisel või ostude kinnitamisel) oma sõrmejälge kasutada."</string>
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Ava ainult siis, kui ekraan on sisse lülitatud"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ekraan peab olema sisse lülitatud, enne kui saate selle sõrmejäljega avada. See muudab juhusliku avamise vähem tõenäoliseks."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekraan, avamine"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Teen seda hiljem"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Tõstke, seejärel puudutage uuesti"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Asetage oma sõrmejälje külg andurile ja hoidke all, seejärel asetage andurile sõrmejälje teine külg"</string>
@@ -1529,8 +1524,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Pole saadaval, kuna uneajarežiim on sees"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Kasuta ekraanisäästjat"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Laadimise ajal või dokis"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Kui on dokitud ja laeb"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Laadimise ajal"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Kui on dokitud"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Mitte kunagi"</string>
@@ -2820,7 +2814,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Ajaloo üksikasjad"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Akukasutus"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Kasutus viimase 24 tunni jooksul"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Kasutus viimasest täislaadimisest"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Kasutamine pärast viimast täislaadimist"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Rakenduse akukasutus"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Kasuta detaile"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Reguleerige energiakasutust"</string>
@@ -3001,25 +2995,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Akukasutus"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Alates viimasest täislaadimisest"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Akukasutuse haldamine"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Kokku <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> taustal\nalates viimasest täislaadimisest"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> kokku • Pärast viimast täislaadimist\ntaustal <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Kokku <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> taustal\nviimase 24 tunni jooksul"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Kokku <xliff:g id="TIME_0">^1</xliff:g> • Ajavahemikus <xliff:g id="TIME_PERIOD">^3</xliff:g>\ntaustal <xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Alates viimasest täislaadimisest kokku vähem kui minut"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Pärast viimast täislaadimist kokku vähem kui minut"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Viimase 24 tunni jooksul kokku vähem kui minut"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Ajavahemikus <xliff:g id="TIME_PERIOD">^1</xliff:g> kokku vähem kui minut"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Alates viimasest täislaadimisest taustal vähem kui minut"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Pärast viimast täislaadimist taustal vähem kui minut"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Viimase 24 tunni jooksul taustal vähem kui minut"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Ajavahemikus <xliff:g id="TIME_PERIOD">^1</xliff:g> taustal vähem kui minut"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Alates viimasest täislaadimisest kokku <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Pärast viimast täislaadimist kokku <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Viimase 24 tunni jooksul kokku <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Ajavahemikus <xliff:g id="TIME_PERIOD">^2</xliff:g> kokku <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> taustal alates viimasest täislaadimisest"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Pärast viimast täislaadimist taustal <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> taustal viimase 24 tunni jooksul"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"Ajavahemikus <xliff:g id="TIME_PERIOD">^2</xliff:g> taustal <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Kokku <xliff:g id="TIME">^1</xliff:g> • Taustal vähem kui minut\nalates viimasest täislaadimisest"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Kokku <xliff:g id="TIME">^1</xliff:g> • Pärast viimast täislaadimist\ntaustal vähem kui minut"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Kokku <xliff:g id="TIME">^1</xliff:g> • Viimase 24 tunni jooksul taustal\nvähem kui minut"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Kokku <xliff:g id="TIME_0">^1</xliff:g> • Ajavahemikus <xliff:g id="TIME_PERIOD">^2</xliff:g>\ntaustal vähem kui minut"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Pole alates viimasest täislaadimisest kasutatud"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Pole pärast viimast täislaadimist kasutatud"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Pole viimase 24 tunni jooksul kasutatud"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Teised kasutajad"</string>
@@ -3499,7 +3493,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Kustuta seadmest <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lukustuskuva seaded"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Kasutajate lisamine lukustuskuval"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Vaheta dokkimisel admin.-õigustega kasutajale"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Kas soovite kustutada iseenda?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Kas kustutada kasutaja?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Kas eemaldada profiil?"</string>
@@ -4212,8 +4207,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Teie taotluse kohaselt blokeerib Android selle rakenduse märguannete kuvamise selles seadmes"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Teie taotluse kohaselt blokeerib Android selle märguandekategooria kuvamise selles seadmes"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Teie taotluse kohaselt blokeerib Android selle märguandegrupi kuvamise selles seadmes"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"See rakendus ei saada märguandeid"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategooriad"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Muu"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index b13d796..ea682bc 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Inoiz ez"</item>
-    <item msgid="5065465585332446709">"Minutu bat igarotakoan"</item>
-    <item msgid="622807566366131941">"Bost minutu igarotakoan"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fdea14e..74617b8 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Aurpegi-eredua betiko eta modu seguruan ezabatuko da.\n\nEzabatu ondoren, hatz-marka, PINa, eredua edo pasahitza beharko duzu telefonoa desblokeatzeko."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Erabili aurpegi bidez desblokeatzeko eginbidea telefonoa desblokeatzeko"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Hatz-marka digitala"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Hatz-markaren bidez desblokeatzeko eginbidea erabiltzean"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Lanerako hatz-marka"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Kudeatu hatz-markak"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Hatz-marken erabilera"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Erregistratze-prozesuaren aurrerapena: ehuneko <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Hatz-markaren ehuneko <xliff:g id="PERCENTAGE">%d</xliff:g> erregistratu da"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gehitu da hatz-marka"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Orain, hatz-marka erabil dezakezu tableta desblokeatzeko edo zeu zarela egiaztatzeko, hala nola aplikazioetan saioa hastean edo erosketak onartzean"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Orain, tableta desblokeatzeko edo zeu zarela egiaztatzeko erabil dezakezu hatz-marka, hala nola aplikazioetan saioa hastean"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Orain, gailua desblokeatzeko edo zeu zarela egiaztatzeko erabil dezakezu hatz-marka, hala nola aplikazioetan saioa hastean"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Orain, telefonoa desblokeatzeko edo zeu zarela egiaztatzeko erabil dezakezu hatz-marka, hala nola aplikazioetan saioa hastean"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desblokeatu pantaila aktibo badago bakarrik"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Pantailak aktibo egon behar du hatz-markarekin desblokeatu ahal izateko. Horrela, nahi gabe desblokeatzea ekiditen da."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"pantaila, desblokeatu"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Geroago"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Jaso hatza eta ukitu berriro"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Jarri hatz-markaren albo bat sentsorearen gainean eta eutsi horrela. Ondoren, egin gauza bera beste alboarekin."</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Historiaren xehetasunak"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Bateria-erabilera"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Ikusi azken 24 orduetako erabilera"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Ikusi erabilera bateria guztiz kargatu zenetik"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Ikusi guztiz kargatu zenetik emandako erabilera"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Aplikazioek erabiltzen duten bateria"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Erabilera-xehetasunak"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Doitu energia-erabilera"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Bateria-erabilera"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Guztiz kargatu zenetik"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Kudeatu bateria-erabilera"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> guztira • <xliff:g id="TIME_1">^2</xliff:g> atzeko planoan\nbateria guztiz kargatu zenetik"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> guztira • <xliff:g id="TIME_1">^2</xliff:g> atzeko planoan\nbateria guztiz kargatu zenetik"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> guztira • <xliff:g id="TIME_1">^2</xliff:g> atzeko planoan\nazken 24 orduetan"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> guztira • <xliff:g id="TIME_1">^2</xliff:g> atzeko planoan\n<xliff:g id="TIME_PERIOD">^3</xliff:g> bitartean"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Minutu bat baino gutxiago guztira bateria guztiz kargatu zenetik"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Minutu bat baino gutxiago guztira bateria guztiz kargatu zenetik"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Minutu bat baino gutxiago guztira azken 24 orduetan"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Minutu bat baino gutxiago guztira <xliff:g id="TIME_PERIOD">^1</xliff:g> bitartean"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Minutu bat baino gutxiago atzeko planoan, bateria guztiz kargatu zenetik"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Minutu bat baino gutxiago atzeko planoan, bateria guztiz kargatu zenetik"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Minutu bat baino gutxiago atzeko planoan azken 24 orduetan"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Minutu bat baino gutxiago atzeko planoan <xliff:g id="TIME_PERIOD">^1</xliff:g> bitartean"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> guztira bateria guztiz kargatu zenetik"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> guztira bateria guztiz kargatu zenetik"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> guztira azken 24 orduetan"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> guztira <xliff:g id="TIME_PERIOD">^2</xliff:g> bitartean"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> atzeko planoan, bateria guztiz kargatu zenetik"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> atzeko planoan bateria guztiz kargatu zenetik"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> atzeko planoan azken 24 orduetan"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> atzeko planoan <xliff:g id="TIME_PERIOD">^2</xliff:g> bitartean"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> guztira • Minutu bat baino gutxiago atzeko planoan bateria guztiz kargatu zenetik\n"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> guztira • Minutu bat baino gutxiago atzeko planoan\nbateria guztiz kargatu zenetik"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> guztira • Minutu bat baino gutxiago atzeko planoan azken 24 orduetan\n"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> guztira • Minutu bat baino gutxiago atzeko planoan <xliff:g id="TIME_PERIOD">^2</xliff:g> bitartean\n"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Erabilerarik ez bateria guztiz kargatu zenetik"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Erabilerarik ez bateria guztiz kargatu zenetik"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Erabilerarik ez azken 24 orduetan"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Beste erabiltzaileak"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Ezabatu <xliff:g id="USER_NAME">%1$s</xliff:g> gailutik"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Pantaila blokeatuaren ezarpenak"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Gehitu erabiltzaileak pantaila blokeatutik"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Aldatu administratzailea den erabiltzailera gailua oinarrian jarrita dagoenean"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Zeure burua ezabatu nahi duzu?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Erabiltzaile hau ezabatu?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Profil hau kendu nahi duzu?"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index dd572e5..8a140b4 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"هرگز"</item>
-    <item msgid="5065465585332446709">"پس‌از ۱ دقیقه"</item>
-    <item msgid="622807566366131941">"پس‌از ۵ دقیقه"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 858b2ac..f1be1e6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"مدل چهره شما به‌طور دائم و ایمن حذف خواهد شد.\n\n پس‌از حذف، برای باز کردن قفل تلفن به پین، الگو، یا گذرواژه نیاز خواهید داشت."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"استفاده از «قفل‌گشایی با چهره» برای باز کردن قفل تلفن"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"اثر انگشت"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"هنگام استفاده از «قفل‌گشایی با اثر انگشت»"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"اثر انگشت نمایه کاری"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"مدیریت اثر انگشت"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"استفاده از اثر انگشت برای"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> درصد ثبت شده است"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"درحال ثبت اثر انگشت: <xliff:g id="PERCENTAGE">%d</xliff:g> درصد"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"اثر انگشت اضافه شد"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"اکنون می‌توانید از اثر انگشتتان برای باز کردن قفل رایانه لوحی یا به‌تأیید رساندن هویتتان (مثلاً هنگام ورود به سیستم برنامه‌ها یا تأیید خریدها) استفاده کنید"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ازاین‌پس می‌توانید از اثر انگشتتان برای باز کردن قفل رایانه لوحی‌تان یا به‌تأیید رساندن هویتتان (مثلاً هنگام ورود به سیستم برنامه‌ها) استفاده کنید"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ازاین‌پس می‌توانید از اثر انگشتتان برای باز کردن قفل دستگاهتان یا به‌تأیید رساندن هویتتان (مثلاً هنگام ورود به سیستم برنامه‌ها) استفاده کنید"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ازاین‌پس می‌توانید از اثر انگشتتان برای باز کردن قفل تلفنتان یا به‌تأیید رساندن هویتتان (مثلاً هنگام ورود به سیستم برنامه‌ها) استفاده کنید"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"باز کردن قفل تنها هنگامی که صفحه‌نمایش روشن باشد"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"پیش‌از اینکه بتوانید قفل را با اثر انگشتتان باز کنید، صفحه‌نمایش باید روشن باشد. این کار احتمال باز شدن قفل به‌صورت تصادفی را کاهش می‌دهد."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"صفحه‌نمایش، باز کردن قفل"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"بعداً انجام شود"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"بردارید و دوباره لمس کنید"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"یک سمت انگشتتان را روی حسگر قرار دهید و نگه دارید، سپس این کار را با سمت دیگر تکرار کنید"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"دردسترس نیست زیرا «حالت وقت خواب» روشن است"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"استفاده از محافظ صفحه"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"هنگام شارژ یا اتصال به پایه"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"هنگام اتصال به پایه و شارژ"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"هنگام شارژ شدن"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"وقتی روی پایه است"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"هرگز"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"جزئیات سابقه"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"مصرف باتری"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"مشاهده مصرف باتری در ۲۴ ساعت قبل"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"مشاهده مصرف باتری از آخرین شارژ کامل"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"مشاهده میزان استفاده از آخرین شارژ کامل"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"مصرف باتری برنامه"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"جزئیات استفاده"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"تنظیم استفاده از نیرو"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"مصرف باتری"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"از زمان شارژ کامل"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"مدیریت مصرف باتری"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> در مجموع • <xliff:g id="TIME_1">^2</xliff:g> استفاده در پس‌زمینه\nاز آخرین شارژ کامل"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> در مجموع • <xliff:g id="TIME_1">^2</xliff:g> در پس‌زمینه\nاز زمان آخرین شارژ کامل"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> درمجموع • <xliff:g id="TIME_1">^2</xliff:g> استفاده در پس‌زمینه\nطی ۲۴ ساعت گذشته"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> درمجموع • <xliff:g id="TIME_1">^2</xliff:g> استفاده در پس‌زمینه\nدر بازه <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"در مجموع کمتر از یک دقیقه استفاده از آخرین شارژ کامل"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"مجموعاً کمتراز یک دقیقه از زمان آخرین شارژ کامل"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"مجموع کمتر از یک دقیقه در ۲۴ ساعت گذشته"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"مجموع کمتر از یک دقیقه در بازه <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"کمتراز یک دقیقه استفاده در پس‌زمینه از آخرین شارژ کامل"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"کمتراز یک دقیقه در پس‌زمینه از زمان آخرین شارژ کامل"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"کمتر از یک دقیقه استفاده در پس‌زمینه طی ۲۴ ساعت گذشته"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"کمتر از یک دقیقه استفاده در پس‌زمینه طی <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> در مجموع از آخرین شارژ کامل"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"مجموعاً <xliff:g id="TIME">^1</xliff:g> از زمان آخرین شارژ کامل"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"مجموع <xliff:g id="TIME">^1</xliff:g> در ۲۴ ساعت گذشته"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"مجموع <xliff:g id="TIME_0">^1</xliff:g> در بازه <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> استفاده در پس‌زمینه از آخرین شارژ کامل"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> در پس‌زمینه از زمان آخرین شارژ کامل"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> استفاده در پس‌زمینه در ۲۴ ساعت گذشته"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> استفاده در پس‌زمینه در بازه <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"در مجموع: <xliff:g id="TIME">^1</xliff:g> • کمتراز یک دقیقه استفاده در پس‌زمینه\nاز آخرین شارژ کامل"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> در مجموع • کمتراز یک دقیقه در پس‌زمینه\nاز زمان آخرین شارژ کامل"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"در مجموع: <xliff:g id="TIME">^1</xliff:g> • کمتراز یک دقیقه استفاده در پس‌زمینه\nطی ۲۴ ساعت گذشته"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"درمجموع: <xliff:g id="TIME_0">^1</xliff:g> • کمتراز یک دقیقه استفاده در پس‌زمینه\nطی <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"از آخرین شارژ کامل استفاده نشده است"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"هیچ استفاده‌ای از زمان آخرین شارژ کامل نداشته است"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"در ۲۴ ساعت گذشته استفاده نشده است"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"کاربران دیگر"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> از این دستگاه"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"تنظیمات صفحه قفل"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"افزودن کاربران از صفحه قفل"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"هنگام اتصال به پایه، به کاربر سرپرست جابه‌جا شود"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"حذف خودتان؟"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"این کاربر حذف شود؟"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"این نمایه حذف شود؟"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏طبق درخواست شما، Android اعلان‌های این برنامه را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏طبق درخواست شما، Android این دسته از اعلان‌ها را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏طبق درخواست شما، Android این گروه از اعلان‌ها را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"این برنامه اعلان ارسال نمی‌کند"</string>
     <string name="notification_channels" msgid="1502969522886493799">"دسته‌ها"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"موارد دیگر"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index b042f1e..7b25247 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Ei koskaan"</item>
-    <item msgid="5065465585332446709">"1 minuutin kuluttua"</item>
-    <item msgid="622807566366131941">"5 minuutin kuluttua"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 66fcc55..cf65b8f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Kasvomalli poistetaan pysyvästi ja turvallisesti.\n\nPoistamisen jälkeen tarvitset PIN-koodia, kuviota tai salasanaa puhelimen lukituksen avaamiseen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Avaa puhelimen lukitus kasvojentunnistusavauksella"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Sormenjälki"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Kun sormenjälkiavaus on käytössä"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Sormenjälki (työ)"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Sormenjälkien hallinta"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Sormenj. käyttökohde"</string>
@@ -530,7 +529,7 @@
     <string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Kasvot ja sormenjäljet lisättiin"</string>
     <string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"Kasvot ja sormenjälki lisättiin"</string>
     <string name="biometric_settings_intro" msgid="4263069383955676756">"Otettuasi kasvojentunnistus- ja sormenjälkiavauksen käyttöön puhelimesi pyytää sormenjälkeäsi, kun käytät maskia tai olet pimeässä ympäristössä"</string>
-    <string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"Tapoja avata lukitus"</string>
+    <string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"Lukituksen avaustavat"</string>
     <string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"Avaa puhelimen lukitus"</string>
     <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Vahvista henkilöllisyytesi sovelluksilla"</string>
     <string name="biometric_settings_use_face_preference_summary" msgid="1821648836899408477">"Käytä kasvoja"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> prosenttia otettu käyttöön"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Sormenjäljen käyttöönotosta <xliff:g id="PERCENTAGE">%d</xliff:g> prosenttia valmiina"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sormenjälki lisätty"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Voit nyt käyttää sormenjälkeäsi tabletin lukituksen avaamiseen tai henkilöllisyyden todentamiseen esim. kirjautuessasi sovelluksiin tai hyväksyessäsi ostoksen"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Voit nyt käyttää sormenjälkeäsi tabletin lukituksen avaamiseen tai henkilöllisyyden todentamiseen esim. kirjautuessasi sovelluksiin"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Voit nyt käyttää sormenjälkeäsi laitteen lukituksen avaamiseen tai henkilöllisyyden todentamiseen esim. kirjautuessasi sovelluksiin"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Voit nyt käyttää sormenjälkeäsi puhelimen lukituksen avaamiseen tai henkilöllisyyden todentamiseen esim. kirjautuessasi sovelluksiin"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Avaa lukitus vain, kun näyttö on päällä"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Näytön täytyy olla päällä, jotta voit avata lukituksen sormenjäljellä. Näin on epätodennäköisempää, että lukitus avautuu vahingossa."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Näytön lukituksen avaaminen"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Tee myöhemmin"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Nosta sormi ja kosketa taas"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Aseta sormenjäljen reuna tunnistimen päälle ja pidä se siinä, ja tee sitten sama toiselle reunalle"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Historiatiedot"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Akun käyttö"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Näytä 24 viime tunnin käyttötiedot"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Katso käyttö edell. täyteen lataamisesta"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Katso täyden latauksen jälkeinen käyttö"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Sovelluksen akunkäyttö"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Käyttötiedot"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Säädä virrankäyttöä"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Akun käyttö"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Edellisen täyden latauksen jälkeen"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Rajaa akunkäyttöä"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Yhteensä <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> taustalla\nviimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Yhteensä <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> taustalla\nedellisen täyteen lataamisen jälkeen"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Yhteensä <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> taustalla\n24 viime tunnin aikana"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Yhteensä <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> taustalla\nklo <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Yhteensä alle minuutti viimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Yhteensä alle minuutti edellisen täyteen lataamisen jälkeen"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Yhteensä alle minuutti 24 viime tunnin aikana"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Yhteensä alle minuutti klo <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Alle minuutti taustalla viimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Alle minuutti taustalla edellisen täyteen lataamisen jälkeen"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Alle minuutti taustalla 24 viime tunnin aikana"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Alle minuutti taustalla klo <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Yhteensä <xliff:g id="TIME">^1</xliff:g> viimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> edellisen täyteen lataamisen jälkeen"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Yhteensä <xliff:g id="TIME">^1</xliff:g> 24 viime tunnin aikana"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Yhteensä <xliff:g id="TIME_0">^1</xliff:g> klo <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> taustalla viimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> taustalla edellisen täyteen lataamisen jälkeen"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> taustalla 24 viime tunnin aikana"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> taustalla klo <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Yhteensä <xliff:g id="TIME">^1</xliff:g> • alle minuutti taustalla\nviimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Yhteensä <xliff:g id="TIME">^1</xliff:g> • alle minuutti taustalla edellisen\ntäyteen lataamisen jälkeen"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Yhteensä <xliff:g id="TIME">^1</xliff:g> • alle minuutti taustalla\n24 viime tunnin aikana"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Yhteensä <xliff:g id="TIME_0">^1</xliff:g> • alle minuutti taustalla\nklo <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Ei käyttöä viimeisimmän täyteen lataamisen jälkeen"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Ei käyttöä edellisen täyteen lataamisen jälkeen"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Ei käyttöä 24 viime tunnin aikana"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Muut käyttäjät"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Poista <xliff:g id="USER_NAME">%1$s</xliff:g> laitteesta"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lukitusnäytön asetukset"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Lisää käyttäjiä lukitusnäytöllä"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Vaihda järjestelmänvalvojakäyttäjään telineessä"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Haluatko poistaa itsesi?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Poistetaanko käyttäjä?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Poistetaanko profiili?"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index cb95f71..379ba57 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Jamais"</item>
-    <item msgid="5065465585332446709">"Après 1 minute"</item>
-    <item msgid="622807566366131941">"Après 5 minutes"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a410e2d..c811222 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Votre modèle facial sera supprimé de façon permanente et sécurisée.\n\nPour déverrouiller votre téléphone, vous aurez ensuite besoin de ce qui suit : NIP, schéma ou mot de passe."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Utilisez le déverrouillage par reconnaissance faciale pour déverrouiller votre téléphone"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Empreintes digitales"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Lors de l\'utilisation du déverrouillage par empreinte digitale"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Empreinte digitale pour le travail"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Gérer les empreintes digitales"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Util. empr. dig. pour"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Inscription : <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Inscription de l\'empreinte digitale : <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empreinte digitale ajoutée"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre tablette ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre tablette ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre appareil ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Déverrouiller uniquement lorsque l\'écran est allumé"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"L\'écran doit être allumé avant que vous puissiez le déverrouiller avec votre empreinte digitale. Cela diminue les risques de déverrouillage accidentel."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Écran, déverrouiller"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Plus tard"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Levez le doigt et touchez le capteur de nouveau"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Placez le côté de votre empreinte digitale sur le capteur et maintenez-le en place, puis passez à l\'autre côté"</string>
@@ -2713,7 +2711,7 @@
     <string name="keywords_accessibility" msgid="4263443239404659143">"Convivialité, facilité d\'accès, assistance, accessibilité"</string>
     <string name="keywords_magnification" msgid="3908145308269840862">"Agrandisseur d\'écran, zoom, agrandissement, vision faible, agrandir, rendre plus gros"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
-    <string name="keywords_live_caption" msgid="1667203998080567556">"Sous-titres, sous-titrage, CC, Transcription instantanée, malentendant, perte auditive, transcription en temps réel assistée par ordinateur, synthèse textuelle, sous-titrer"</string>
+    <string name="keywords_live_caption" msgid="1667203998080567556">"Sous-titres, sous-titrage, CC, sous-titres instantanés, malentendant, perte auditive, transcription en temps réel assistée par ordinateur, synthèse textuelle, sous-titrer"</string>
     <string name="keywords_live_transcribe" msgid="3226990195174890997"></string>
     <string name="keywords_sound_notifications" msgid="8183107485754075413"></string>
     <string name="keywords_sound_amplifier" msgid="939404835256246663"></string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Détails de l\'historique"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Utilisation de la pile"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Voir utilisation des dernières 24 heures"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Voir utilisation depuis dernière recharge"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Utilisation depuis la charge complète"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Utilisation de la pile par les applications"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Détails d\'utilisation"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajuster la consommation"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Utilisation de la pile"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Depuis la charge complète"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gérer l\'utilisation de la pile"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> en arrière-plan\ndepuis la dernière recharge complète"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> d\'utilisation au total • <xliff:g id="TIME_1">^2</xliff:g> d\'utilisation en arrière-plan\ndepuis la dernière recharge complète"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> en arrière-plan\nau cours des dernières 24 h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> d\'utilisation en arrière-plan\ndurant la période de <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Utilisation au total : moins d\'une minute depuis la dernière recharge complète"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Moins d\'une minute au total depuis la dernière recharge complète"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Utilisation au total : moins d\'une minute au cours des dernières 24 heures"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Utilisation au total : moins d\'une minute durant la période de <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Utilisation en arrière-plan : moins d\'une minute depuis la dernière recharge complète"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Moins d\'une minute en arrière-plan depuis la dernière recharge complète"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Utilisation en arrière-plan : moins d\'une minute au cours des dernières 24 heures"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Utilisation en arrière-plan : moins d\'une minute durant la période de <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> au total depuis la dernière recharge complète"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> d\'utilisation au total depuis la dernière recharge complète"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> au total au cours des dernières 24 heures"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> d\'utilisation au total durant la période de <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> d\'utilisation en arrière-plan à partir de la dernière recharge complète"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> d\'utilisation en arrière-plan depuis la dernière recharge complète"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> d\'utilisation en arrière-plan au cours des dernières 24 heures"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> d\'utilisation en arrière-plan durant la période de <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> au total • Utilisation en arrière-plan : moins d\'une minute\ndepuis la dernière recharge complète"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> d\'utilisation au total • moins d\'une minute d\'utilisation en arrière-plan\ndepuis la dernière recharge complète"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> au total • Utilisation en arrière-plan : moins d\'une minute\nau cours des dernières 24 heures"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> au total • moins d\'une minute d\'utilisation en arrière-plan\ndurant la période de <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Aucune utilisation depuis la dernière recharge complète"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Aucune utilisation depuis la dernière recharge complète"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Aucune utilisation au cours des dernières 24 heures"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Autres utilisateurs"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Paramètres de l\'écran de verrouillage"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Ajouter des utilisateurs à partir de l\'écran de verrouillage"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Activer l\'utilisateur administrateur lorsque connecté"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Vous supprimer?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Supprimer cet utilisateur?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Supprimer ce profil?"</string>
@@ -3835,7 +3834,7 @@
     <string name="emergency_tone_alert" msgid="1977698889522966589">"Tonalités"</string>
     <string name="emergency_tone_vibrate" msgid="6282296789406984698">"Vibrations"</string>
     <string name="boot_sounds_title" msgid="5033062848948884111">"Activation par les sons"</string>
-    <string name="live_caption_title" msgid="8617086825712756983">"Transcription instantanée"</string>
+    <string name="live_caption_title" msgid="8617086825712756983">"Sous-titres instantanés"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ajouter automatiquement des sous-titres aux contenus multimédias"</string>
     <string name="spatial_audio_speaker" msgid="9145233652433523302">"Haut-parleur du téléphone"</string>
     <string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Casque d\'écoute filaire"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 23ae87d..725c353 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Jamais"</item>
-    <item msgid="5065465585332446709">"Après 1 minute"</item>
-    <item msgid="622807566366131941">"Après 5 minutes"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 61ea4cb..42fa6df 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Votre empreinte faciale sera supprimée de façon définitive et sécurisée.\n\nVous devrez ensuite utiliser un code, un schéma ou un mot de passe pour déverrouiller votre téléphone."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Déverrouillez votre téléphone par reconnaissance faciale"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Empreinte digitale"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Lors utilisation déverrouillage par empreinte digitale"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Empreinte pour travail"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Gérer empreintes num."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Utiliser empr. dig. pour"</string>
@@ -591,16 +590,15 @@
     <skip />
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Enregistrement de l\'empreinte digitale à <xliff:g id="PERCENTAGE">%d</xliff:g> pour cent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empreinte digitale ajoutée"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Vous pouvez désormais utiliser votre empreinte digitale pour déverrouiller votre tablette ou valider votre identité (par exemple, pour vous connecter à des applis ou approuver un achat)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Vous pouvez désormais utiliser votre empreinte digitale pour déverrouiller votre tablette ou confirmer votre identité, par exemple pour vous connecter à des applis"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Vous pouvez désormais utiliser votre empreinte digitale pour déverrouiller votre appareil ou confirmer votre identité, par exemple pour vous connecter à des applis"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Vous pouvez désormais utiliser votre empreinte digitale pour déverrouiller votre téléphone ou confirmer votre identité, par exemple pour vous connecter à des applis"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Déverrouiller uniquement lorsque l\'écran est allumé"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"L\'écran doit être allumé pour que vous puissiez le déverrouiller avec votre empreinte digitale. Cela réduit le risque de déverrouillage accidentel."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Déverrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Plus tard"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Levez le doigt, puis reposez-le"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Placez le côté de votre empreinte sur le capteur, maintenez-le, puis passez à l\'autre côté"</string>
@@ -1525,8 +1523,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Indisponible, car Heure du coucher est activé"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Utiliser l\'économiseur d\'écran"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Lorsque l\'appareil est en charge ou connecté à une station d\'accueil"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Lorsque sur station et en recharge"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Lorsque l\'appareil est en charge"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Lorsque l\'appareil est connecté à une station d\'accueil"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Jamais"</string>
@@ -2816,7 +2813,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Historique"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Utilisation de la batterie"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Voir l\'utilisation des dernières 24 h"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Voir utilisation depuis dernière charge complète"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Utilis. depuis dernière charge complète"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Utilisation de la batterie par l\'appli"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Détails d\'utilisation"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajuster la consommation"</string>
@@ -2997,25 +2994,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Utilisation de la batterie"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Depuis la charge complète"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gérer l\'utilisation de la batterie"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> en arrière-plan\ndepuis la dernière charge complète"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> en arrière-plan\ndepuis la dernière charge complète"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> en arrière-plan\n au cours des dernières 24 h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> au total • <xliff:g id="TIME_1">^2</xliff:g> en arrière-plan\npour la période : <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total de moins d\'une minute en arrière-plan depuis la dernière charge complète"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total de moins d\'une minute en arrière-plan depuis la dernière charge complète"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total de moins d\'une minute au cours des dernières 24 h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Moins d\'une minute au total pour la période : <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Moins d\'une minute en arrière-plan depuis la dernière charge complète"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Moins d\'une minute en arrière-plan depuis la dernière charge complète"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Moins d\'une minute en arrière-plan au cours des dernières 24 h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Moins d\'une minute en arrière-plan pour la période : <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> au total depuis la dernière charge complète"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> au total depuis la dernière charge complète"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> au total au cours des dernières 24 h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> au total pour la période : <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> en arrière-plan depuis la dernière charge complète"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> en arrière-plan depuis la dernière charge complète"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> en arrière-plan au cours des dernières 24 h"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> en arrière-plan pour la période : <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> au total • Moins d\'une minute en arrière-plan\ndepuis la dernière charge complète"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> au total • Moins d\'une minute en arrière-plan\ndepuis la dernière charge complète"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> au total • Moins d\'une minute en arrière-plan au cours des dernières 24 h\n"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> au total • Moins d\'une minute en arrière-plan\npour la période : <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Pas d\'utilisation depuis la dernière charge complète"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Aucune utilisation depuis la dernière charge complète"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Pas d\'utilisation au cours des dernières 24 h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Autres utilisateurs"</string>
@@ -3495,7 +3492,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Paramètres de l\'écran de verrouillage"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Ajouter des utilisateurs depuis l\'écran de verrouillage"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Passer en administrateur quand sur station d\'accueil"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Supprimer cet utilisateur ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Supprimer l\'utilisateur ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Supprimer ce profil ?"</string>
@@ -4208,8 +4206,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"À votre demande, Android bloque l\'affichage des notifications de cette application sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"À votre demande, Android bloque l\'affichage de cette catégorie de notifications sur cet appareil"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"À votre demande, Android bloque l\'affichage de ce groupe de notifications sur cet appareil"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Cette appli n\'envoie pas de notifications"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Catégories"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Autres"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 699c22e..95bcb3b 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nunca"</item>
-    <item msgid="5065465585332446709">"Tras 1 minuto"</item>
-    <item msgid="622807566366131941">"Tras 5 minutos"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d512890..f2e3b37 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"O teu modelo facial eliminarase de xeito seguro e permanente.\n\nUnha vez eliminado, terás que usar o PIN, o padrón ou o contrasinal para desbloquear o teléfono."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Usa o desbloqueo facial para desbloquear o teléfono"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Impresión dixital"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Cando se estea usando o desbloqueo dactilar"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Impresión dixital"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Xest. identificación"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Usar impresión para"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> por cento rexistrado"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Rexistrando impresión dixital (<xliff:g id="PERCENTAGE">%d</xliff:g> por cento)"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Engadiuse a impresión dixital"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Agora podes utilizar a túa impresión dixital para desbloquear a tableta ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación ou aprobar unha compra)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Xa podes utilizar a impresión dixital para desbloquear a tableta ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Xa podes utilizar a impresión dixital para desbloquear o dispositivo ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Xa podes utilizar a impresión dixital para desbloquear o teléfono ou verificar a túa identidade (por exemplo, cando queiras iniciar sesión nunha aplicación)"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloquear só cando a pantalla estea acesa"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"A pantalla debe estar acesa antes para que poidas desbloqueala coa impresión dixital. Deste xeito, é menos probable que se desbloquee de forma accidental."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Pantalla, desbloqueo"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Facelo máis tarde"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Levanta o dedo e volve tocar"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Mantén a parte lateral da túa impresión dixital no sensor e, despois, cambia ao outro lado"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Non dispoñible porque hora de durmir está activado"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Usar protector de pantalla"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Ao estar cargando ou na base"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Mestres está na base e cargando"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Ao estar cargando"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Ao estar na base"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nunca"</string>
@@ -1924,8 +1921,7 @@
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Conexión por Ethernet"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte a conexión a Internet do teléfono por Ethernet"</string>
-    <!-- no translation found for ethernet_tethering_subtext (8796744370636115313) -->
-    <skip />
+    <string name="ethernet_tethering_subtext" product="tablet" msgid="8796744370636115313">"Comparte por Ethernet a conexión a Internet da tableta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa wifi ou a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Axuda"</string>
@@ -2815,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalles do historial"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Uso da batería"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Consulta o uso das últimas 24 horas"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Mira o uso desde a última carga completa"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Uso desde a última carga completa"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Uso da batería para a aplicación"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Axustar uso de enerxía"</string>
@@ -2996,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Uso da batería"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Desde a carga completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Xestionar o uso da batería"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndesde a última carga completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\ndesde a última carga completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\nnas últimas 24 horas"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> en total • <xliff:g id="TIME_1">^2</xliff:g> en segundo plano\nentre <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Menos dun minuto en total desde a última carga completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Menos dun minuto en total desde a última carga completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Menos dun minuto en total nas últimas 24 horas"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Menos dun minuto en total entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menos dun minuto en segundo plano desde a última carga completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menos dun minuto en segundo plano desde a última carga completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menos dun minuto en segundo plano nas últimas 24 horas"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menos dun minuto en segundo plano entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> en total desde a última carga completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> en total desde a última carga completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> en total nas últimas 24 horas"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> en total entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> en segundo plano desde a última carga completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> en segundo plano desde a última carga completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> en segundo plano nas últimas 24 horas"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> en segundo plano entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> en total • menos dun minuto en segundo plano\ndesde a última carga completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> en total • Menos dun minuto en segundo plano\ndesde a última carga completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> en total • menos dun minuto en segundo plano\nnas últimas 24 horas"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> en total • menos dun minuto en segundo plano\nentre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Sen uso da batería desde a última carga completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Sen uso desde a última carga completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Sen uso nas últimas 24 horas"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Outros usuarios"</string>
@@ -3494,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Configuración da pantalla de bloqueo"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Engadir usuarios desde a pantalla de bloqueo"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Cambiar ao usuario administrador ao poñelo na base"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Queres eliminarte a ti mesmo?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Eliminar este usuario?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Quitar este perfil?"</string>
@@ -4207,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Segundo solicitaches, Android bloquea a visualización de notificacións desta aplicación neste dispositivo."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Segundo solicitaches, Android bloquea a visualización desta categoría de notificacións neste dispositivo."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Segundo solicitaches, Android bloquea a visualización deste grupo de notificacións neste dispositivo."</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Esta aplicación non envía notificacións"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Categorías"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Outros"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index bb40c5d..295610e 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ક્યારેય નહીં"</item>
-    <item msgid="5065465585332446709">"1 મિનિટ પછી"</item>
-    <item msgid="622807566366131941">"5 મિનિટ પછી"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4f9d94d..ed06f0d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"તમારા ચહેરાનું મૉડલ કાયમ માટે અને સુરક્ષિત રીતે ડિલીટ કરવામાં આવશે.\n\nડિલીટ કર્યા પછી, તમારો ફોન અનલૉક કરવા માટે, તમને તમારા પિન, પૅટર્ન કે પાસવર્ડની જરૂર રહેશે."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"તમારા ફોનને અનલૉક કરવા માટે ફેસ અનલૉક સુવિધાનો ઉપયોગ કરો"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ફિંગરપ્રિન્ટ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ફિંગરપ્રિન્ટ અનલૉક કરવાની સુવિધાનો ઉપયોગ કરતી વખતે"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ઑફિસ માટે ફિંગરપ્રિન્ટ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ફિંગરપ્રિન્ટનું સંચાલન"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"આ માટે ફિંગરપ્રિન્ટ ઉપયોગ"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"નોંધણી: <xliff:g id="PERCENTAGE">%d</xliff:g> ટકા"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ફિંગરપ્રિન્ટની નોંધણી કરવાની પ્રક્રિયા <xliff:g id="PERCENTAGE">%d</xliff:g> ટકા પૂર્ણ થઈ છે"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ફિંગરપ્રિન્ટ ઉમેરી"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"તમે ઍપમાં સાઇન ઇન કરો કે કોઈ ખરીદીને મંજૂરી આપો તેવા સમયે તમારા ટૅબ્લેટને અનલૉક કરવા અથવા એ તમે જ છો તેની ચકાસણી કરવા માટે, હવે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"હવે તમે તમારું ટૅબ્લેટ અનલૉક કરવા અથવા સાઇન ઇન કરનાર તમે જ છો તેની ચકાસણી કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો, જેમ કે જ્યારે તમે ઍપમાં સાઇન ઇન કરો ત્યારે"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"હવે તમે તમારું ડિવાઇસ અનલૉક કરવા અથવા સાઇન ઇન કરનાર તમે જ છો તેની ચકાસણી કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો, જેમ કે જ્યારે તમે ઍપમાં સાઇન ઇન કરો ત્યારે"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"હવે તમે તમારો ફોન અનલૉક કરવા અથવા સાઇન ઇન કરનાર તમે જ છો તેની ચકાસણી કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો, જેમ કે જ્યારે તમે ઍપમાં સાઇન ઇન કરો ત્યારે"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"જ્યારે સ્ક્રીન ચાલુ હોય, ત્યારે જ અનલૉક કરો"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"તમે તમારી ફિંગરપ્રિન્ટ વડે અનલૉક કરી શકો તે પહેલાં સ્ક્રીન ચાલુ હોવી આવશ્યક છે. આમ કરવાથી આકસ્મિક રીતે અનલૉક થવાની શક્યતા ઘટે છે."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"સ્ક્રીન, અનલૉક કરો"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"આને થોડા સમય પછી કરો"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ઉપાડો, પછી ફરી ટચ કરો"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"તમારી આંગળીને સેન્સર પર મૂકો અને દબાવી રાખો, પછી આંગળીના બીજા ભાગોને સેન્સર પર મૂકો"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"ઉપલબ્ધ નથી, કારણ કે બેડટાઇમ મોડ ચાલુ છે"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"સ્ક્રીન સેવરનો ઉપયોગ કરો"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"ચાર્જ થતું હોય અથવા ડૉક કરેલ હોય ત્યારે"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ડૉક અને ચાર્જ કરતી વખતે"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"ચાર્જિંગ થતી વખતે"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ડૉક હોય ત્યારે"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"ક્યારેય નહીં"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ઇતિહાસ વિગતો"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"બૅટરીનો વપરાશ"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"છેલ્લા 24 કલાકનો વપરાશ જુઓ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછીનો વપરાશ જુઓ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, કરાયેલો વપરાશ જુઓ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ઍપ દ્વારા બૅટરીનો વપરાશ"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"વિગતોનો ઉપયોગ કરો"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"પાવર વપરાશ સમાયોજિત કરો"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"બૅટરી વપરાશ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"સંપૂર્ણ ચાર્જ પછી"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"બૅટરી વપરાશ મેનેજ કરો"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"કુલ <xliff:g id="TIME_0">^1</xliff:g> • છેલ્લે પૂર્ણ ચાર્જ કરાયા પછી\nબૅકગ્રાઉન્ડમાં <xliff:g id="TIME_1">^2</xliff:g> વપરાશ થયો"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"કુલ <xliff:g id="TIME_0">^1</xliff:g> • છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી\nબૅકગ્રાઉન્ડમાં <xliff:g id="TIME_1">^2</xliff:g> વપરાશ થયો"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"કુલ <xliff:g id="TIME_0">^1</xliff:g> • છેલ્લા 24 કલાકમાં\nબૅકગ્રાઉન્ડમાં <xliff:g id="TIME_1">^2</xliff:g> વપરાશ થયો"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"બૅટરીનો કુલ વપરાશ <xliff:g id="TIME_0">^1</xliff:g> થયો • <xliff:g id="TIME_PERIOD">^3</xliff:g> દરમિયાન બૅટરીનો <xliff:g id="TIME_1">^2</xliff:g> બૅકગ્રાઉન્ડમાં\n વપરાશ થયો"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"છેલ્લે પૂર્ણ ચાર્જ કરાયા પછી બૅકગ્રાઉન્ડમાં કુલ એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, બૅકગ્રાઉન્ડમાં કુલ એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"છેલ્લા 24 કલાકમાં બૅકગ્રાઉન્ડમાં કુલ એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> દરમિયાન બૅટરીનો બૅકગ્રાઉન્ડમાં કુલ એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"છેલ્લે પૂર્ણ ચાર્જ કરાયા પછી, બૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, બૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"છેલ્લા 24 કલાકમાં બૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> દરમિયાન બૅટરીનો બૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"છેલ્લા પૂર્ણ ચાર્જ પછી કુલ વપરાશ <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, કુલ <xliff:g id="TIME">^1</xliff:g> વપરાશ થયો"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"છેલ્લા 24 કલાકમાં કુલ વપરાશ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> દરમિયાન બૅટરીનો બૅકગ્રાઉન્ડમાં કુલ <xliff:g id="TIME_0">^1</xliff:g> વપરાશ થયો"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"છેલ્લે પૂર્ણ ચાર્જ કરાયા પછી બૅકગ્રાઉન્ડમાં <xliff:g id="TIME">^1</xliff:g> વપરાશ થયો"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, બૅકગ્રાઉન્ડમાં <xliff:g id="TIME">^1</xliff:g> વપરાશ થયો"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"છેલ્લા 24 કલાકમાં બૅકગ્રાઉન્ડમાં <xliff:g id="TIME">^1</xliff:g> વપરાશ થયો"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> દરમિયાન બૅટરીનો બૅકગ્રાઉન્ડમાં <xliff:g id="TIME_0">^1</xliff:g> વપરાશ થયો"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"કુલ <xliff:g id="TIME">^1</xliff:g> •છેલ્લે પૂર્ણ ચાર્જ કરાયા પછી\nબૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"કુલ <xliff:g id="TIME">^1</xliff:g> • છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી\nબૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"કુલ <xliff:g id="TIME">^1</xliff:g> • છેલ્લા 24 કલાકમાં\nબૅકગ્રાઉન્ડમાં એક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"બૅટરીનો કુલ વપરાશ <xliff:g id="TIME_0">^1</xliff:g> થયો • <xliff:g id="TIME_PERIOD">^2</xliff:g> દરમિયાન બૅટરીનો બૅકગ્રાઉન્ડમાં\nએક મિનિટ કરતાં પણ ઓછા સમય માટે વપરાશ થયો"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"છેલ્લે પૂર્ણ ચાર્જ કરાયા પછી બિલકુલ વપરાશ થયો નથી"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"છેલ્લે પૂર્ણ ચાર્જ કર્યા પછી, કોઈ વપરાશ થયો નથી"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"છેલ્લા 24 કલાકમાં બિલકુલ વપરાશ થયો નથી"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"અન્ય વપરાશકર્તાઓ"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"આ ડિવાઇસમાંથી <xliff:g id="USER_NAME">%1$s</xliff:g>ને કાઢી નાખો"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"લૉક સ્ક્રીન સેટિંગ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"લૉક સ્ક્રીનમાંથી વપરાશકર્તાઓને ઉમેરો"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ડૉક કર્યુ હોય ત્યારે ઍડમિન વપરાશકર્તા પર સ્વિચ કરો"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"તમને પોતાને કાઢી નાખીએ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"આ વપરાશકર્તા ડિલીટ કરીએ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"આ પ્રોફાઇલ દૂર કરીએ?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના ગ્રૂપને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"આ ઍપ નોટિફિકેશન મોકલતી નથી"</string>
     <string name="notification_channels" msgid="1502969522886493799">"કૅટેગરી"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"અન્ય"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index a50b604..247ab1e 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"कभी नहीं"</item>
-    <item msgid="5065465585332446709">"एक मिनट बाद"</item>
-    <item msgid="622807566366131941">"पांच मिनट बाद"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2445820..4eea8d4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"आपके चेहरे का मॉडल सुरक्षित तरीके से हमेशा के लिए मिटा दिया जाएगा.\n\nइसके मिटने के बाद, अपने फ़ोन को अनलॉक करने के लिए, आपको पिन, पैटर्न या पासवर्ड का इस्तेमाल करना होगा."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"फ़ोन अनलॉक करने के लिए, फ़ेस अनलॉक की सुविधा का इस्तेमाल करें"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"उंगली की छाप"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"फ़िंगरप्रिंट अनलॉक की सुविधा का इस्तेमाल करने पर"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"वर्क प्रोफ़ाइल के लिए फ़िंगरप्रिंट"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"फ़िंगरप्रिंट प्रबंधित करें"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"इनके के लिए फ़िंगरप्रिंट उपयोग करें"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> प्रतिशत रजिस्टर"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"फ़िंगरप्रिंट सेट अप करने की प्रक्रिया <xliff:g id="PERCENTAGE">%d</xliff:g> प्रतिशत तक पूरी हो चुकी है"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फ़िंगरप्रिंट जोड़ा गया"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"अब अपने टैबलेट को अनलॉक करने या अपनी पहचान की पुष्टि करने के लिए, फ़िंगरप्रिंट का इस्तेमाल किया जा सकता है. जैसे, किसी ऐप्लिकेशन में साइन इन करने या खरीदारी की मंज़ूरी देने के लिए, इस सुविधा का इस्तेमाल किया जा सकता है"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"अब अपने फ़िंगरप्रिंट की मदद से, टैबलेट को अनलॉक किया जा सकता है. इसके अलावा, किसी ऐप्लिकेशन में साइन इन करने या ऐसे और काम करने के दौरान, अपनी पहचान की पुष्टि करने के लिए भी फ़िंगरप्रिंट का इस्तेमाल किया जा सकता है"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"अब अपने फ़िंगरप्रिंट की मदद से, डिवाइस को अनलॉक किया जा सकता है. इसके अलावा, किसी ऐप्लिकेशन में साइन इन करने या ऐसे और काम करने के दौरान, अपनी पहचान की पुष्टि करने के लिए भी फ़िंगरप्रिंट का इस्तेमाल किया जा सकता है"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"अब अपने फ़िंगरप्रिंट की मदद से, फ़ोन को अनलॉक किया जा सकता है. इसके अलावा, किसी ऐप्लिकेशन में साइन इन करने या ऐसे और काम करने के दौरान, अपनी पहचान की पुष्टि करने के लिए भी फ़िंगरप्रिंट का इस्तेमाल किया जा सकता है"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"स्क्रीन चालू होने पर ही अनलॉक होगा"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"फ़िंगरप्रिंट अनलॉक की सुविधा का इस्तेमाल करने से पहले, आपके डिवाइस की स्क्रीन चालू होनी चाहिए. इससे गलती से डिवाइस अनलॉक होने की संभावना कम होती है."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"स्क्रीन, अनलॉक करें"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"इसे बाद में करें"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"हटाएं, फिर दोबारा छुएं"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"पहले अपनी उंगली के एक किनारे को सेंसर पर कुछ देर के लिए रखें और फिर दूसरी तरफ़ से भी ऐसा करें"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"इतिहास विवरण"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"बैटरी खर्च"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"पिछले 24 घंटों में हुए इस्तेमाल की जानकारी"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"पिछली बार पूरा चार्ज होने के बाद हुए इस्तेमाल की जानकारी"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"पूरी चार्ज होने के बाद बैटरी का इस्तेमाल"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ऐप्लिकेशन के लिए बैटरी खर्च"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"विवरणों का उपयोग करें"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"पावर उपयोग एडजस्ट करें"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"बैटरी खर्च"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"पूरी तरह चार्ज होने के बाद से अब तक"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"बैटरी खर्च को मैनेज करें"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"पिछली बार पूरी चार्ज होने के बाद,\nबैटरी का कुल इस्तेमाल <xliff:g id="TIME_0">^1</xliff:g> • बैकग्राउंड में बैटरी का इस्तेमाल <xliff:g id="TIME_1">^2</xliff:g> हुआ"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"पिछली बार बैटरी पूरी चार्ज होने के बाद से,\nउसे कुल <xliff:g id="TIME_0">^1</xliff:g> तक इस्तेमाल किया गया • <xliff:g id="TIME_1">^2</xliff:g> तक बैकग्राउंड में इस्तेमाल किया गया"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"पिछले 24 घंटे में,\nबैटरी का कुल इस्तेमाल <xliff:g id="TIME_0">^1</xliff:g> • बैकग्राउंड में बैटरी का इस्तेमाल <xliff:g id="TIME_1">^2</xliff:g> हुआ"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"बैटरी का कुल इस्तेमाल <xliff:g id="TIME_0">^1</xliff:g> तक हुआ • <xliff:g id="TIME_PERIOD">^3</xliff:g> के बीच,\nबैकग्राउंड में बैटरी का इस्तेमाल <xliff:g id="TIME_1">^2</xliff:g> तक हुआ"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"पिछली बार पूरी चार्ज होने के बाद, बैटरी का कुल इस्तेमाल एक मिनट से भी कम हुआ"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"पिछली बार पूरी चार्ज होने के बाद, बैटरी का इस्तेमाल कुल एक मिनट से भी कम किया गया"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"पिछले 24 घंटे में, बैटरी का कुल इस्तेमाल एक मिनट से भी कम हुआ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> के बीच, बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"पिछली बार पूरी चार्ज होने के बाद, बैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"पिछली बार पूरी चार्ज होने के बाद, बैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम किया गया"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"पिछले 24 घंटे में, बैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> के बीच, बैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"पिछली बार पूरी चार्ज होने के बाद, बैटरी का कुल इस्तेमाल <xliff:g id="TIME">^1</xliff:g> हुआ"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"पिछली बार बैटरी पूरी चार्ज होने के बाद, उसे कुल <xliff:g id="TIME">^1</xliff:g> तक इस्तेमाल किया गया"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"पिछले 24 घंटे में, बैटरी का कुल इस्तेमाल <xliff:g id="TIME">^1</xliff:g> हुआ"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> के बीच, बैटरी का इस्तेमाल <xliff:g id="TIME_0">^1</xliff:g> तक हुआ"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"पिछली बार पूरी चार्ज होने के बाद, बैकग्राउंड में बैटरी का इस्तेमाल <xliff:g id="TIME">^1</xliff:g> हुआ"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"पिछली बार पूरी चार्ज होने के बाद, <xliff:g id="TIME">^1</xliff:g> तक बैटरी का बैकग्राउंड में इस्तेमाल किया गया"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"पिछले 24 घंटे में, बैकग्राउंड में बैटरी का इस्तेमाल <xliff:g id="TIME">^1</xliff:g> हुआ"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> के बीच, बैकग्राउंड में बैटरी का इस्तेमाल <xliff:g id="TIME_0">^1</xliff:g> तक हुआ"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"पिछली बार पूरी चार्ज होने के बाद,\nबैटरी का कुल इस्तेमाल <xliff:g id="TIME">^1</xliff:g> • बैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"पिछली बार बैटरी पूरी चार्ज होने के बाद से,\nउसे कुल <xliff:g id="TIME">^1</xliff:g> तक इस्तेमाल किया गया • बैकग्राउंड में एक मिनट से कम इस्तेमाल किया गया"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"पिछले 24 घंटे में,\nबैटरी का कुल इस्तेमाल <xliff:g id="TIME">^1</xliff:g> • बैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"बैटरी का कुल इस्तेमाल <xliff:g id="TIME_0">^1</xliff:g> तक हुआ • <xliff:g id="TIME_PERIOD">^2</xliff:g> के बीच\nबैकग्राउंड में बैटरी का इस्तेमाल एक मिनट से भी कम हुआ"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"पिछली बार पूरी चार्ज होने के बाद, बैटरी का इस्तेमाल नहीं हुआ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"पिछली बार पूरी चार्ज होने के बाद, बैटरी का इस्तेमाल नहीं किया गया"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"पिछले 24 घंटे में, बैटरी का इस्तेमाल नहीं हुआ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"अन्य उपयोगकर्ता"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"इस उपकरण से <xliff:g id="USER_NAME">%1$s</xliff:g> को मिटाएं"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"लॉक स्‍क्रीन सेटिंग"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"लॉक स्क्रीन से उपयोगकर्ताओं को जोड़ें"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"डिवाइस के डॉक होने पर एडमिन खाते पर जाएं"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"खुद को मिटाएं?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"इस उपयोगकर्ता को हटाएं?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"इस प्रोफ़ाइल को निकालें?"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 4eabec6..1fa3c0d 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nikad"</item>
-    <item msgid="5065465585332446709">"Nakon 1 minute"</item>
-    <item msgid="622807566366131941">"Nakon 5 minuta"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index cbfca93..e7588ff 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -594,10 +594,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisak prsta je dodan"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Sad svojim otiskom prsta možete otključati tablet ili potvrditi da ste to vi, na primjer prilikom prijave u aplikacije ili odobravanja kupnje"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Sad svojim otiskom prsta možete otključati tablet ili potvrditi da ste to vi, na primjer kad se prijavljujete u aplikacije"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Sad svojim otiskom prsta možete otključati uređaj ili potvrditi da ste to vi, na primjer kad se prijavljujete u aplikacije"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Sad svojim otiskom prsta možete otključati telefon ili potvrditi da ste to vi, na primjer kad se prijavljujete u aplikacije"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Otključavanje samo kad je zaslon uključen"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Zaslon mora biti uključen da biste ga mogli otključati otiskom prsta. Time se smanjuje mogućnost slučajnog otključavanja."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Zaslon, otključati"</string>
@@ -2842,7 +2844,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalji povijesti"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Potrošnja baterije"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Prikaz potrošnje u posljednja 24 sata"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Prikaz potrošnje nakon potpunog punjenja"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Pregled upotrebe od zadnjeg potpunog punjenja"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Potrošnja baterije za aplikaciju"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalji upotrebe"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Podesi potrošnju energije"</string>
@@ -3030,25 +3032,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Potrošnja baterije"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od potpunog punjenja"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Upravljanje potrošnjom baterije"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> u pozadini\nod posljednjeg potpunog punjenja"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> u pozadini \nod zadnjeg potpunog punjenja"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> u pozadini\nu posljednja 24 h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> u pozadini\nu razdoblju <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Ukupno manje od minute od posljednjeg potpunog punjenja"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Ukupno manje od minute od zadnjeg potpunog punjenja"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Ukupno manje od minute u posljednja 24 sata"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Ukupno manje od minute u razdoblju <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Manje od minute u pozadini od posljednjeg potpunog punjenja"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Manje od minute u pozadini od zadnjeg potpunog punjenja"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Manje od minute u pozadini u posljednja 24 h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Manje od minute u pozadini u razdoblju <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Ukupno <xliff:g id="TIME">^1</xliff:g> od posljednjeg potpunog punjenja"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Ukupno <xliff:g id="TIME">^1</xliff:g> od zadnjeg potpunog punjenja"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Ukupno <xliff:g id="TIME">^1</xliff:g> u posljednja 24 h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> ukupno u razdoblju <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> u pozadini od posljednjeg potpunog punjenja"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> u pozadini od zadnjeg potpunog punjenja"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> u pozadini u posljednja 24 h"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> u pozadini u razdoblju <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Ukupno <xliff:g id="TIME">^1</xliff:g> • manje od minute u pozadini\nod posljednjeg potpunog punjenja"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Ukupno <xliff:g id="TIME">^1</xliff:g> • manje od minute u pozadini\nod zadnjeg potpunog punjenja"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Ukupno <xliff:g id="TIME">^1</xliff:g> • manje od minute u pozadini\nu posljednja 24 h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Ukupno <xliff:g id="TIME_0">^1</xliff:g> • manje od minute u pozadini\nu razdoblju <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nema potrošnje od posljednjeg potpunog punjenja"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nema upotrebe od zadnjeg potpunog punjenja"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nema potrošnje u posljednja 24 h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Drugi korisnici"</string>
@@ -3532,7 +3534,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g>: brisanje s uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Postavke zaključavanja zaslona"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Dodavanje korisnika sa zaključanog zaslona"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Na priključnoj stanici prijeđi na administratora"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Želite li izbrisati ovog korisnika?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Ukloniti profil?"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 0966d54..22984c0 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Soha"</item>
-    <item msgid="5065465585332446709">"1 perc után"</item>
-    <item msgid="622807566366131941">"5 perc után"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e0e0618..9c75629 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Arcmodelljét véglegesen és biztonságosan töröljük.\n\nAz eltávolítás után PIN-kódra, mintára vagy jelszóra lesz szüksége a telefon feloldásához."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"A telefon feloldásához használja az Arcalapú feloldást"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Ujjlenyomat"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Ujjlenyomattal való feloldás használata esetén"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Ujjlenyomat munkához"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Ujjlenyomatok kezelése"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Ujjlenyomat ehhez:"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Regisztrálva <xliff:g id="PERCENTAGE">%d</xliff:g> százalék"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Ujjlenyomat regisztrálása folyamatban – <xliff:g id="PERCENTAGE">%d</xliff:g> százalék"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Ujjlenyomat hozzáadva"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Mostantól használhatja ujjlenyomatát eszköze zárolásának feloldásához vagy személyazonossága igazolásához (például amikor valamilyen alkalmazásba jelentkezik be, vagy vásárlást hagy jóvá)."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Mostantól használhatja ujjlenyomatát táblagépe zárolásának feloldásához vagy személyazonossága igazolásához (például amikor alkalmazásokba jelentkezik be)."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Mostantól használhatja ujjlenyomatát eszköze zárolásának feloldásához vagy személyazonossága igazolásához (például amikor alkalmazásokba jelentkezik be)."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Mostantól használhatja ujjlenyomatát telefonja zárolásának feloldásához vagy személyazonossága igazolásához (például amikor alkalmazásokba jelentkezik be)."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Csak akkor oldja fel a képernyőt, ha be van kapcsolva a képernyő"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"A képernyőnek bekapcsolva kell lennie, hogy feloldhassa az ujjlenyomatával. Így kisebb az esélye a véletlen feloldásoknak."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Képernyő, feloldás"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Később"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Emelje fel, majd érintse meg újra"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Helyezze az ujja oldalsó részét az érzékelőre, és tartsa lenyomva, majd helyezze az érzékelőre az ujja másik oldalát"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Előzmények részletei"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Akkumulátorhasználat"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Használat az elmúlt 24 óra során"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Használat az utolsó teljes feltöltés óta"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Használat az utolsó teljes feltöltés óta"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Alkalmazás akkumulátorhasználata"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Használat részletei"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Az energiafelhasználás beállítása"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Akkuhasználat"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Teljes feltöltés óta"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Akkuhasználat kezelése"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Összesen: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> a háttérben\naz utolsó teljes feltöltés óta"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Összesen: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> háttérbeli használat\naz utolsó teljes feltöltés óta"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Összesen: <xliff:g id="TIME_0">^1</xliff:g> • Háttérben az\nelmúlt 24 óra során: <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Összesen <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> a háttérben\na következő időintervallumban: <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Összesen egy percnél kevesebb az utolsó teljes feltöltés óta"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Összesen egy percnél kevesebb az utolsó teljes feltöltés óta"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Összesen egy percnél kevesebb az elmúlt 24 órában"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Összesen kevesebb, mint egy perc a következő időintervallumban: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Egy percnél kevesebb az utolsó teljes feltöltés óta"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Egy percnél kevesebb háttérbeli használat az utolsó teljes feltöltés óta"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Kevesebb, mint egy percig a háttérben az elmúlt 24 órában"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Kevesebb, mint egy percig a háttérben a következő időintervallumban: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Összesen: <xliff:g id="TIME">^1</xliff:g> az utolsó teljes feltöltés óta"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Összesen <xliff:g id="TIME">^1</xliff:g> az utolsó teljes feltöltés óta"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Összesen: <xliff:g id="TIME">^1</xliff:g> az elmúlt 24 órában"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Összesen <xliff:g id="TIME_0">^1</xliff:g> a következő időintervallumban: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> a háttérben az utolsó teljes feltöltés óta"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> háttérbeli használat az utolsó teljes feltöltés óta"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> a háttérben az elmúlt 24 órában"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> a háttérben a következő időintervallumban: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Összesen: <xliff:g id="TIME">^1</xliff:g> • kevesebb, mint egy percig a háttérben\naz utolsó teljes feltöltés óta"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Összesen: <xliff:g id="TIME">^1</xliff:g> • Egy percnél kevesebb háttérbeli használat\naz utolsó teljes feltöltés óta"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Összesen: <xliff:g id="TIME">^1</xliff:g> • kevesebb, mint egy percig\na háttérben az elmúlt 24 órában"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Összesen <xliff:g id="TIME_0">^1</xliff:g> • kevesebb, mint egy percig\na háttérben a következő időintervallumban: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nincs használat az utolsó teljes feltöltés óta"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nem volt használva az utolsó teljes feltöltés óta"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nem volt használatban az elmúlt 24 órában"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Egyéb felhasználók"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> törlése"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Lezárási képernyő beállításai"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Felhasználók hozzáadása a lezárási képernyőről"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Dokkoláskor váltás adminisztrátor felhasználóra"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Törli önmagát?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Törli a felhasználót?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Eltávolítja a profilt?"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 42043b3..9bd9dfd 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Երբեք"</item>
-    <item msgid="5065465585332446709">"1 րոպեից"</item>
-    <item msgid="622807566366131941">"5 րոպեից"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c3404c4..b7f7b30 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Ձեր դեմքի նմուշն ընդմիշտ կջնջվի և ոչ մի տեղ չի պահվի։\n\nՋնջելուց հետո հեռախոսը ապակողպելու համար անհրաժեշտ կլինի ձեր PIN կոդը, նախշը կամ գաղտնաբառը։"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Օգտագործեք դեմքով ապակողպումը՝ հեռախոսն ապակողպելու համար"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Մատնահետք"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Երբ օգտագործում եք մատնահետքով ապակողպում"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Մատնահետք (աշխատանք)"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Մատնահետքերի կառավար"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Օգտագործման նպատակը"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Գրանցվել է <xliff:g id="PERCENTAGE">%d</xliff:g> տոկոսով"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Մատնահետքը գրանցվել է <xliff:g id="PERCENTAGE">%d</xliff:g> տոկոսով"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Մատնահետքն ավելացվեց"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Այժմ դուք կարող եք օգտագործել ձեր մատնահետքը՝ պլանշետն ապակողպելու կամ ձեր ինքնությունը հաստատելու համար (օր․՝ հավելվածներ մտնելիս կամ որևէ գնում հաստատելիս)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Այժմ կարող եք օգտագործել ձեր մատնահետքը՝ պլանշետն ապակողպելու կամ ձեր ինքնությունը հաստատելու համար (օր․՝ հավելվածներում մուտք գործելիս)։"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Այժմ կարող եք օգտագործել ձեր մատնահետքը՝ սարքն ապակողպելու կամ ձեր ինքնությունը հաստատելու համար (օր․՝ հավելվածներում մուտք գործելիս)։"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Այժմ կարող եք օգտագործել ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ ձեր ինքնությունը հաստատելու համար (օր․՝ հավելվածներում մուտք գործելիս)։"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Ապակողպել, միայն երբ էկրանը միացված է"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Նախքան սարքը մատնահետքով ապակողպելը անհրաժեշտ է միացնել էկրանը։ Սա նվազեցնում է պատահական ապակողպման հավանականությունը։"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Էկրան, ապակողպում"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Ավելի ուշ"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Բարձրացրեք, ապա կրկին հպեք"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Մատի մի կողմը դրեք տվիչի վրա և պահեք, ապա նույնն արեք մյուս կողմով"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Անհասանելի է, քանի որ քնի ռեժիմը միացված է"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Օգտագործել էկրանապահ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Լիցքավորման ընթացքում կամ դոկ-կայանում"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Երբ դոկ-կայանում է և լիցքավորվում է"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Լիցքավորման ընթացքում"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Դոկ-կայանում"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Երբեք"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Պատմության մանրամասները"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Մարտկոցի օգտագործում"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Դիտեք վերջին 24 ժամվա տվյալները"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Սպառումը վերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Օգտագործումը վերջին լրիվ լիցքից հետո"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Հավելվածի կողմից մարտկոցի օգտագործում"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Օգտագործման մանրամասները"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Կարգավորել հոսանքի օգտագործումը"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Մարտկոցի օգտագործում"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Լրիվ լիցքավորումից հետո"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Մարտկոցի օգտագործման կառավարում"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Ընդհանուր՝ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ֆոնային ռեժիմում՝\nվերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Ընդհանուր <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ֆոնային ռեժիմում՝\nվերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Ընդհանուր՝ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ֆոնային ռեժիմում՝\nվերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Ընդհանուր <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ֆոնային ռեժիմում \n<xliff:g id="TIME_PERIOD">^3</xliff:g> ժամանակահատվածում"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Ընդհանուր՝ մինչև մեկ րոպե վերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Ընդհանուր՝ մինչև մեկ րոպե վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Ընդհանուր՝ մինչև մեկ րոպե վերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ժամանակահատվածում ընդհանուր մինչև մեկ րոպե"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Մինչև մեկ րոպե ֆոնային ռեժիմում՝ վերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Մինչև մեկ րոպե ֆոնային ռեժիմում՝ վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Մինչև մեկ րոպե ֆոնային ռեժիմում՝ վերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Մինչև մեկ րոպե ֆոնային ռեժիմում՝ <xliff:g id="TIME_PERIOD">^1</xliff:g> ժամանակահատվածում"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Ընդհանուր՝ <xliff:g id="TIME">^1</xliff:g> վերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Ընդհանուր <xliff:g id="TIME">^1</xliff:g>՝ վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Ընդհանուր՝ <xliff:g id="TIME">^1</xliff:g> վերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Ընդհանուր <xliff:g id="TIME_0">^1</xliff:g>՝ <xliff:g id="TIME_PERIOD">^2</xliff:g> ժամանակահատվածում"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> ֆոնային ռեժիմում՝ վերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> ֆոնային ռեժիմում՝ վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> ֆոնային ռեժիմում՝ վերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> ֆոնային ռեժիմում՝ <xliff:g id="TIME_PERIOD">^2</xliff:g> ժամանակահատվածում"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Ընդհանուր՝ <xliff:g id="TIME">^1</xliff:g> • Մինչև մեկ րոպե ֆոնային ռեժիմում՝\nվերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Ընդհանուր <xliff:g id="TIME">^1</xliff:g> • ֆոնային ռեժիմում՝\nմինչև մեկ րոպե վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Ընդհանուր՝ <xliff:g id="TIME">^1</xliff:g> • Մինչև մեկ րոպե ֆոնային ռեժիմում՝\nվերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Ընդհանուր <xliff:g id="TIME_0">^1</xliff:g> • Մինչև մեկ րոպե ֆոնային ռեժիմում\n<xliff:g id="TIME_PERIOD">^2</xliff:g> ժամանակահատվածում"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Մարտկոցը չի օգտագործվել վերջին լրիվ լիցքավորումից հետո"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Չի օգտագործվել վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Մարտկոցը չի օգտագործվել վերջին 24 ժամվա ընթացքում"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Այլ օգտատերեր"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Ջնջել <xliff:g id="USER_NAME">%1$s</xliff:g>-ին այս սարքից"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Էկրանի կողպման կարգավորումները"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Ավելացնել օգտատերեր կողպէկրանից"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Դոկ-կայանում անցնել ադմինիստրատորի ռեժիմին"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Ջնջե՞լ ձեզ:"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ջնջե՞լ օգտատիրոջը"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Հեռացնե՞լ այս պրոֆիլը:"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Դուք անջատել եք այս հավելվածի ծանուցումները"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Դուք անջատել եք ծանուցումների այս կատեգորիան"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Դուք անջատել եք ծանուցումների այս խումբը"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Այս հավելվածը ծանուցումներ չի ուղարկում"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Կատեգորիաներ"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Այլ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 18178f8..2a52913 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Tidak pernah"</item>
-    <item msgid="5065465585332446709">"Setelah 1 menit"</item>
-    <item msgid="622807566366131941">"Setelah 5 menit"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6b1dc94..8af7cdf 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Model wajah Anda akan dihapus secara permanen dan aman.\n\nSetelah dihapus, Anda akan memerlukan PIN, pola, atau sandi untuk membuka kunci ponsel."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Gunakan Face Unlock untuk membuka kunci ponsel Anda"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Sidik jari"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Jika menggunakan Fingerprint Unlock"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Sidik jari untuk profil kerja"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Mengelola sidik jari"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Sidik jari untuk"</string>
@@ -501,11 +500,11 @@
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="tablet" msgid="530891604602839577">"Saat anak Anda menggunakan Pixel Imprint, gambar digunakan untuk memperbarui model sidik jarinya. Gambar yang digunakan untuk membuat model sidik jari anak Anda tidak pernah disimpan, tetapi model sidik jarinya disimpan secara aman di tablet dan tidak pernah dikirim ke luar tablet. Semua pemrosesan dilakukan secara aman di tablet."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="device" msgid="1735767057693277593">"Saat anak Anda menggunakan Pixel Imprint, gambar digunakan untuk memperbarui model sidik jarinya. Gambar yang digunakan untuk membuat model sidik jari anak Anda tidak pernah disimpan, tetapi model sidik jarinya disimpan secara aman di perangkat dan tidak pernah dikirim ke luar perangkat. Semua pemrosesan dilakukan secara aman di perangkat."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="default" msgid="3948305045484131665">"Anda dapat menghapus gambar dan model sidik jari Anda, atau menonaktifkan Fingerprint Unlock kapan saja di Setelan. Gambar dan model sidik jari disimpan di ponsel sampai Anda menghapusnya."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="tablet" msgid="1577753788807120092">"Anda dapat menghapus gambar dan model sidik jari atau menonaktifkan Fingerprint Unlock kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di tablet hingga Anda menghapusnya."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="device" msgid="5092396314447369758">"Anda dapat menghapus gambar dan model sidik jari atau menonaktifkan Fingerprint Unlock kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di perangkat hingga Anda menghapusnya."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="tablet" msgid="1577753788807120092">"Anda dapat menghapus gambar dan model sidik jari atau menonaktifkan Buka dengan Sidik Jari kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di tablet hingga Anda menghapusnya."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="device" msgid="5092396314447369758">"Anda dapat menghapus gambar dan model sidik jari atau menonaktifkan Buka dengan Sidik Jari kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di perangkat hingga Anda menghapusnya."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="default" msgid="4983770600405797515">"Anda dan anak Anda dapat menghapus gambar dan model sidik jarinya atau menonaktifkan Fingerprint Unlock kapan saja di Setelan. Gambar dan model sidik jari disimpan di ponsel sampai dihapus."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="tablet" msgid="8752022694697150943">"Anda dan anak Anda dapat menghapus gambar dan model sidik jarinya atau menonaktifkan Fingerprint Unlock kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di tablet hingga dihapus."</string>
-    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="device" msgid="7234973062059196893">"Anda dan anak Anda dapat menghapus gambar dan model sidik jarinya atau menonaktifkan Fingerprint Unlock kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di perangkat hingga dihapus."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="tablet" msgid="8752022694697150943">"Anda dan anak Anda dapat menghapus gambar dan model sidik jarinya atau menonaktifkan Buka dengan Sidik Jari kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di tablet hingga dihapus."</string>
+    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="device" msgid="7234973062059196893">"Anda dan anak Anda dapat menghapus gambar dan model sidik jarinya atau menonaktifkan Buka dengan Sidik Jari kapan saja di Setelan. Gambar dan model sidik jari akan disimpan di perangkat hingga dihapus."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="2018885671994058605">"Ponsel Anda dapat dibuka kuncinya meski Anda tidak bermaksud membukanya, misalnya saat seseorang mendekatkan ponsel ke jari Anda."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="7390208617531513381">"Tablet Anda dapat dibuka kuncinya meski Anda tidak bermaksud membukanya, misalnya saat seseorang menempelkan tablet ke jari Anda."</string>
     <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="device" msgid="1662571028234764290">"Perangkat Anda dapat dibuka kuncinya meski Anda tidak bermaksud membukanya, misalnya saat seseorang menempelkan perangkat ke jari Anda."</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Terdaftar <xliff:g id="PERCENTAGE">%d</xliff:g> persen"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Mendaftarkan sidik jari <xliff:g id="PERCENTAGE">%d</xliff:g> persen"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sidik jari ditambahkan"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Anda kini dapat menggunakan sidik jari untuk membuka kunci tablet atau memverifikasi diri Anda, seperti saat login ke aplikasi atau menyetujui pembelian"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Kini Anda dapat menggunakan sidik jari untuk membuka kunci tablet atau memverifikasi diri Anda, seperti saat login ke aplikasi"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Kini Anda dapat menggunakan sidik jari untuk membuka kunci perangkat atau memverifikasi diri Anda, seperti saat login ke aplikasi"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Kini Anda dapat menggunakan sidik jari untuk membuka kunci ponsel atau memverifikasi diri Anda, seperti saat login ke aplikasi"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Buka kunci hanya saat layar aktif"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Layar harus aktif sebelum Anda dapat membuka kunci dengan sidik jari. Hal ini mengurangi peristiwa kunci tidak sengaja terbuka."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Layar, Buka kunci"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Lakukan nanti"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Angkat jari, lalu sentuh lagi"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Posisikan sisi sidik jari Anda pada sensor, kemudian tahan, lalu beralihlah ke sisi lainnya"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Tidak tersedia karena mode Waktu Tidur aktif"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Gunakan screensaver"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Saat mengisi baterai atau terpasang di dok"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Saat dipasang ke dok &amp; mengisi daya"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Saat mengisi baterai"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Saat terpasang di dok"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Tidak pernah"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detail histori"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Penggunaan baterai"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Melihat penggunaan selama 24 jam terakhir"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Lihat penggunaan dari pengisian daya penuh terakhir"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Lihat penggunaan sejak terakhir penuh"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Penggunaan baterai aplikasi"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detail penggunaan"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Sesuaikan penggunaan daya"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Penggunaan baterai"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Sejak baterai terisi penuh"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Kelola penggunaan baterai"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Total <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> di latar belakang\nsejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Total <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> di latar belakang\nsejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Total <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> di latar belakang\nselama 24 jam terakhir"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Total <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> di latar belakang\nselama <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total kurang dari satu menit sejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total kurang dari satu menit sejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total kurang dari satu menit selama 24 jam terakhir"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total kurang dari satu menit selama <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Di latar belakang kurang dari satu menit sejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Di latar belakang kurang dari satu menit sejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Di latar belakang kurang dari satu menit selama 24 jam terakhir"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Di latar belakang kurang dari satu menit selama <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Total <xliff:g id="TIME">^1</xliff:g> sejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Total <xliff:g id="TIME">^1</xliff:g> sejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Total <xliff:g id="TIME">^1</xliff:g> selama 24 jam terakhir"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Total <xliff:g id="TIME_0">^1</xliff:g> untuk <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> di latar belakang sejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> di latar belakang sejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> di latar belakang selama 24 jam terakhir"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> di latar belakang selama <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Total <xliff:g id="TIME">^1</xliff:g> • di latar belakang kurang dari satu menit\nsejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Total <xliff:g id="TIME">^1</xliff:g> • di latar belakang kurang dari satu menit\nsejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Total <xliff:g id="TIME">^1</xliff:g> • di latar belakang kurang dari\nsatu menit selama 24 jam terakhir"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Total <xliff:g id="TIME_0">^1</xliff:g> • di latar belakang kurang dari satu menit\nselama <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Tidak ada penggunaan sejak terakhir kali baterai terisi penuh"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Tidak ada penggunaan sejak terakhir kali baterai terisi penuh"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Tidak ada penggunaan selama 24 jam terakhir"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Pengguna lainnya"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Hapus <xliff:g id="USER_NAME">%1$s</xliff:g> di perangkat"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Setelan layar kunci"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Tambahkan pengguna dari layar kunci"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Beralih ke pengguna admin saat terpasang ke dok"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Hapus diri Anda sendiri?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Hapus pengguna ini?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Buang profil ini?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Sesuai permintaan, Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Sesuai permintaan, Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Sesuai permintaan, Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Aplikasi ini tidak mengirim notifikasi"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategori"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Lainnya"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 2d8a08f..0ca1387 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Aldrei"</item>
-    <item msgid="5065465585332446709">"Eftir 1 mínútu"</item>
-    <item msgid="622807566366131941">"Eftir 5 mínútur"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5365cdc..fb88c8e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Andlitslíkaninu þínu verður eytt endanlega á öruggan hátt.\n\nÞegar búið er að eyða því þarftu PIN-númer, mynstur eða aðgangsorð til að taka símann úr lás."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Notaðu andlitskenni til að taka símann úr lás"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingrafar"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Þegar fingrafarskenni er notað"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingrafar fyrir vinnu"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Stjórna fingraförum"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Nota fingrafar fyrir"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> prósent skráð"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Skráir fingrafar <xliff:g id="PERCENTAGE">%d</xliff:g> prósent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingrafari bætt við"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Nú geturðu notað fingrafarið til að taka spjaldtölvuna úr lás eða til að staðfesta hver þú ert, t.d. þegar þú skráir þig inn í forrit eða samþykkir kaup"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Nú geturðu notað fingrafarið þitt til að opna spjaldtölvuna eða til að staðfesta hver þú ert, t.d. við innskráningu í forrit"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Nú geturðu notað fingrafarið þitt til að opna tækið eða til að staðfesta hver þú ert, t.d. við innskráningu í forrit"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Nú geturðu notað fingrafarið þitt til að opna símann eða til að staðfesta hver þú ert, t.d. við innskráningu í forrit"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Aðeins taka úr lás ef kveikt er á skjá"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Það verður að vera kveikt á skjánum áður en þú tekur hann úr lás með fingrafarinu þínu. Þetta dregur úr hættu á að taka skjáinn óvart úr lás."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skjár, taka úr lás"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gera þetta seinna"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Lyftu og snertu svo aftur"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Settu hlið fingrafarsins á fingrafaralesarann og haltu fingrinum þar. Skiptu svo yfir á hina hliðina"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Ekki í boði þar sem kveikt er á svefntímastillingu"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Nota skjávara"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Við hleðslu eða í dokku"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Þegar tengt er við dokku og hleðslu"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Við hleðslu"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Þegar tækið er í dokku"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Aldrei"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Upplýsingar um notkun"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Rafhlöðunotkun"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Skoða notkun síðasta sólarhringinn"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Skoða notkun frá síðustu fullu hleðslu"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Skoða notkun frá síðustu fullu hleðslu"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Rafhlöðunotkun forrits"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Notkunarupplýsingar"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Stilla orkunotkun"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Rafhlöðunotkun"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Frá síðustu fullu hleðslu"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Stjórna rafhlöðunotkun"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> alls • <xliff:g id="TIME_1">^2</xliff:g> í bakgrunni\nfrá síðustu fullu hleðslu"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> alls • <xliff:g id="TIME_1">^2</xliff:g> í bakgrunni\nfrá síðustu fullu hleðslu"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> alls • <xliff:g id="TIME_1">^2</xliff:g> í bakgrunni\nsíðasta sólarhringinn"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> alls • <xliff:g id="TIME_1">^2</xliff:g> í bakgrunni\ní <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Alls innan við mínútu frá síðustu fullu hleðslu"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Alls innan við mínútu frá síðustu fullu hleðslu"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Alls innan við mínútu síðasta sólarhringinn"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Alls innan við mínútu frá <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Í bakgrunni innan við mínútu frá síðustu fullu hleðslu"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Í bakgrunni innan við mínútu frá síðustu fullu hleðslu"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Í bakgrunni innan við mínútu síðasta sólarhringinn"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Í bakgrunni innan við mínútu frá <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> alls frá síðustu fullu hleðslu"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> alls frá síðustu fullu hleðslu"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> alls síðasta sólarhringinn"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> alls frá <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> í bakgrunni frá síðustu fullu hleðslu"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> í bakgrunni frá síðustu fullu hleðslu"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> í bakgrunni síðasta sólarhringinn"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> í bakgrunni frá <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> alls • í bakgrunni innan við mínútu\nfrá síðustu fullu hleðslu"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> alls • í bakgrunni innan við mínútu\nfrá síðustu fullu hleðslu"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> alls • í bakgrunni innan við mínútu\nsíðasta sólarhringinn"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> alls • í bakgrunni innan við mínútu frá\ní <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Engin notkun frá síðustu fullu hleðslu"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Engin notkun frá síðustu fullu hleðslu"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Engin notkun síðasta sólarhringinn"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Aðrir notendur"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Eyða <xliff:g id="USER_NAME">%1$s</xliff:g> úr þessu tæki"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Stillingar fyrir læstan skjá"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Bæta við notendum af lásskjánum"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Skipta yfir í stjórnanda þegar tækið er í dokku"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Eyða sjálfum/sjálfri þér?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Viltu eyða þessum notanda?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Fjarlægja þetta snið?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android kemur í veg fyrir að tilkynningar þessa forrits birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android kemur í veg fyrir að þessi tilkynningaflokkur birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android kemur í veg fyrir að þessi tilkynningahópur birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Þetta forrit sendir ekki tilkynningar"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Flokkar"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Annað"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index f594d86..b2fbdbf 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Mai"</item>
-    <item msgid="5065465585332446709">"Dopo 1 minuto"</item>
-    <item msgid="622807566366131941">"Dopo 5 minuti"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1a05341..f6e8688 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Il modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare il PIN, la sequenza o la password per sbloccare il telefono."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Usa lo sblocco con il volto per sbloccare il tuo telefono"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Impronta"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Quando viene usato lo sblocco con l\'impronta"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Impronta per lavoro"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Gestisci impronte digitali"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Utilizza l\'impronta per"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Completamento registrazione: <xliff:g id="PERCENTAGE">%d</xliff:g> per cento"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrazione dell\'impronta al <xliff:g id="PERCENTAGE">%d</xliff:g> percento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impronta aggiunta"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Ora puoi usare l\'impronta per sbloccare il tablet o per verificare la tua identità, ad esempio per accedere alle app o approvare un acquisto"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Ora puoi usare l\'impronta per sbloccare il tablet o verificare la tua identità, ad esempio quando accedi alle app"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Ora puoi usare l\'impronta per sbloccare il dispositivo o verificare la tua identità, ad esempio quando accedi alle app"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Ora puoi usare l\'impronta per sbloccare il telefono o verificare la tua identità, ad esempio quando accedi alle app"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Sblocca solo quando lo schermo è attivo"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Devi attivare lo schermo prima di poter sbloccare con la tua impronta. In questo modo si riduce la probabilità di sblocchi accidentali."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Schermo, sblocco"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Più tardi"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Solleva, quindi tocca di nuovo"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Appoggia un lato del dito sul sensore e tieni premuto, quindi cambia lato"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Non disponibili perché la modalità Riposo è attiva"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Usa il salvaschermo"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Durante la ricarica o quando inserito nel dock"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Inserito nel dock e in carica"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Durante la ricarica"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Mai"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Dettagli cronologia"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Utilizzo batteria"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Visualizza utilizzo delle ultime 24 ore"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Utilizzo dall\'ultima ricarica completa"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Esamina uso da ultima ricarica completa"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Utilizzo della batteria per l\'app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Dettagli di utilizzo"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Regola consumo alimentazione"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Utilizzo batteria"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Dalla ricarica completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gestisci utilizzo batteria"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Totale: <xliff:g id="TIME_0">^1</xliff:g> • In background: <xliff:g id="TIME_1">^2</xliff:g>\ndall\'ultima ricarica completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Totale: <xliff:g id="TIME_0">^1</xliff:g> • In background: <xliff:g id="TIME_1">^2</xliff:g>\ndall\'ultima ricarica completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Totale: <xliff:g id="TIME_0">^1</xliff:g> • In background: <xliff:g id="TIME_1">^2</xliff:g>\nnelle ultime 24 ore"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Totale: <xliff:g id="TIME_0">^1</xliff:g> • In background: <xliff:g id="TIME_1">^2</xliff:g>\nnell\'intervallo di tempo <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Totale: meno di un minuto dall\'ultima ricarica completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Totale: meno di un minuto dall\'ultima ricarica completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Totale: meno di un minuto nelle ultime 24 ore"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Totale: meno di un minuto nell\'intervallo di tempo <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"In background: meno di un minuto dall\'ultima ricarica completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"In background: meno di un minuto dall\'ultima ricarica completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"In background: meno di un minuto nelle ultime 24 ore"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"In background: meno di un minuto nell\'intervallo di tempo <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Totale: <xliff:g id="TIME">^1</xliff:g> dall\'ultima ricarica completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Totale: <xliff:g id="TIME">^1</xliff:g> dall\'ultima ricarica completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Totale: <xliff:g id="TIME">^1</xliff:g> nelle ultime 24 ore"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Totale: <xliff:g id="TIME_0">^1</xliff:g> nell\'intervallo di tempo <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"In background: <xliff:g id="TIME">^1</xliff:g> dall\'ultima ricarica completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> in background dall\'ultima ricarica completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"In background: <xliff:g id="TIME">^1</xliff:g> nelle ultime 24 ore"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"In background: <xliff:g id="TIME_0">^1</xliff:g> nell\'intervallo di tempo <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Totale: <xliff:g id="TIME">^1</xliff:g> • In background: meno di un minuto\ndall\'ultima ricarica completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Totale: <xliff:g id="TIME">^1</xliff:g> • In background: meno di un minuto\ndall\'ultima ricarica completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Totale: <xliff:g id="TIME">^1</xliff:g> • In background: meno di un minuto\nnelle ultime 24 ore"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Totale: <xliff:g id="TIME_0">^1</xliff:g> • In background: meno di un minuto\nnell\'intervallo di tempo <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nessun utilizzo dall\'ultima ricarica completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nessun utilizzo dall\'ultima ricarica completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nessun utilizzo nelle ultime 24 ore"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Altri utenti"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Elimina <xliff:g id="USER_NAME">%1$s</xliff:g> da dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Impostazioni schermata di blocco"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Aggiungi utenti da schermata di blocco"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Passa a utente amministratore se inserito nel dock"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Eliminare te stesso?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Eliminare questo utente?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Rimuovere questo profilo?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Come richiesto, Android sta bloccando la visualizzazione delle notifiche dell\'app su questo dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Come richiesto, Android sta bloccando la visualizzazione di questa categoria di notifiche su questo dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Come richiesto, Android sta bloccando la visualizzazione di questo gruppo di notifiche su questo dispositivo"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Questa app non invia notifiche"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Categorie"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Altro"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 023aa01..45ca180 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"אף פעם"</item>
-    <item msgid="5065465585332446709">"לאחר דקה אחת"</item>
-    <item msgid="622807566366131941">"לאחר 5 דקות"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8259915..ddac746 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"התבנית לזיהוי הפנים שלך תימחק באופן סופי ומאובטח.\n\nלאחר המחיקה, יהיה צורך בקוד האימות, בקו ביטול הנעילה או בסיסמה שלך כדי לבטל את נעילת הטלפון."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"שימוש בפתיחה ע\"י זיהוי הפנים לצורך ביטול הנעילה של הטלפון"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"טביעת אצבע"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"בעת שימוש בתכונה \'ביטול הנעילה בטביעת אצבע\'"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"טביעת אצבע לעבודה"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ניהול טביעות אצבע"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"שימוש בטביעות אצבע ל-"</string>
@@ -601,16 +600,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"טביעת האצבע שלך נקלטה"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"עכשיו אפשר להשתמש בטביעת אצבע כדי לבטל את נעילת הטאבלט או כדי לאמת את זהותך, למשל בכניסה לחשבון באפליקציות או באישור רכישה"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"עכשיו אפשר להשתמש בטביעת האצבע כדי לבטל את הנעילה של הטאבלט או כדי לאמת את הזהות שלך, למשל בכניסה לאפליקציות"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"עכשיו אפשר להשתמש בטביעת האצבע כדי לבטל את נעילת המכשיר או כדי לאמת את הזהות שלך, למשל בכניסה לאפליקציות"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"עכשיו אפשר להשתמש בטביעת האצבע כדי לבטל את הנעילה של הטלפון או כדי לאמת את הזהות שלך, למשל בכניסה לאפליקציות"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ביטול נעילה רק כשהמסך פועל"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"המסך צריך להיות מופעל לפני ביטול נעילה עם טביעת אצבע, כדי לצמצם את ביטול הנעילה בטעות."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"מסך, ביטול נעילה"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"לא עכשיו"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"מרימים ונוגעים בחיישן שוב"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"מניחים צד אחד של האצבע על החיישן ומחזיקים. אחר כך עוברים לצד השני"</string>
@@ -2879,7 +2877,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"פרטי היסטוריה"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"שימוש בסוללה"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"נתוני השימוש ב-24 השעות האחרונות"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"השימוש מאז הטעינה המלאה האחרונה"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"תצוגה של השימוש מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"שימוש בסוללה לאפליקציה"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"פרטי שימוש"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"התאמת צריכת סוללה"</string>
@@ -3074,25 +3072,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"שימוש בסוללה"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"מאז הטעינה המלאה"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ניהול השימוש בסוללה"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> בסה\"כ • <xliff:g id="TIME_1">^2</xliff:g> ברקע\nמאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> בסה\"כ • <xliff:g id="TIME_1">^2</xliff:g> ברקע\nמאז הטעינה המלאה האחרונה"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> בסה\"כ • <xliff:g id="TIME_1">^2</xliff:g> ברקע\nבמהלך 24 השעות האחרונות"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> בסה\"כ • <xliff:g id="TIME_1">^2</xliff:g> ברקע\nבשעות <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"פחות מדקה בסה\"כ מאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"פחות מדקה בסה\"כ מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"פחות מדקה בסה\"כ ב-24 השעות האחרונות"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"פחות מדקה בסה\"כ בשעות <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"פחות מדקה ברקע מאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"פחות מדקה ברקע מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"פחות מדקה ברקע ב-24 השעות האחרונות"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"פחות מדקה ברקע בשעות <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> בסה\"כ מאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> בסה\"כ מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> בסה\"כ ב-24 השעות האחרונות"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> בסה\"כ בשעות <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> ברקע מאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> ברקע מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> ברקע ב-24 השעות האחרונות"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> ברקע בשעות <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> בסה\"כ • פחות מדקה ברקע\nמאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> בסה\"כ • פחות מדקה ברקע\nמאז הטעינה המלאה האחרונה"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> בסה\"כ • פחות מדקה ברקע\nבמשך 24 השעות האחרונות"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> בסה\"כ • פחות מדקה ברקע\nבשעות <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"לא בשימוש מאז הטעינה המלאה האחרונה"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"ללא שימוש מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"לא נעשה שימוש ב-24 השעות האחרונות"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"משתמשים אחרים"</string>
@@ -3580,7 +3578,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"מחיקת <xliff:g id="USER_NAME">%1$s</xliff:g> ממכשיר זה"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"הגדרות מסך נעילה"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"הוספת משתמשים ממסך הנעילה"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"מעבר למשתמש עם הרשאת אדמין במהלך עגינה"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"האם למחוק אותך?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"למחוק את המשתמש/ת?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"האם להסיר פרופיל זה?"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index d825324..57368f3 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"なし"</item>
-    <item msgid="5065465585332446709">"1 分後"</item>
-    <item msgid="622807566366131941">"5 分後"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5b061f9..9cf3034 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"顔モデルは安全かつ完全に削除されます。\n\n削除後に、スマートフォンのロックを解除するには、PIN、パターン、パスワードのいずれかが必要になります。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"顔認証を使用して、スマートフォンのロックを解除します"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"指紋"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"指紋認証の使用時"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"仕事用の指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"指紋の管理"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"指紋の用途"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"登録済み: <xliff:g id="PERCENTAGE">%d</xliff:g> パーセント"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"指紋の登録中: <xliff:g id="PERCENTAGE">%d</xliff:g> パーセント"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指紋の登録完了"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"指紋認証を使用して、タブレットのロック解除や本人確認（アプリへのログインや購入の承認など）を行えるようになりました"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"指紋を使って、タブレットのロック解除や本人確認（アプリへのログインなど）を行えるようになりました"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"指紋を使って、デバイスのロック解除や本人確認（アプリへのログインなど）を行えるようになりました"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"指紋を使って、スマートフォンのロック解除や本人確認（アプリへのログインなど）を行えるようになりました"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"画面が ON のときのみロック解除"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"指紋認証を使用するには画面が ON になっている必要があります。これにより、意図しないロック解除が起こりにくくなります。"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"画面、ロック解除"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"後で行う"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"指を離して、もう一度タッチ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"指紋をセンサーに当てて長押しし、指を離してから別の部分を当ててください"</string>
@@ -1335,7 +1333,7 @@
     <string name="wifi_disconnected_from" msgid="5249576734324159708">"<xliff:g id="SSID">%1$s</xliff:g> との接続を解除しました"</string>
     <string name="carrier" msgid="1755020806290963951">"携帯通信会社"</string>
     <string name="display_settings_title" msgid="626835071804834218">"表示"</string>
-    <string name="sound_settings" msgid="7622986039384531304">"着信音とバイブレーション"</string>
+    <string name="sound_settings" msgid="7622986039384531304">"サウンドとバイブレーション"</string>
     <string name="all_volume_title" msgid="6196367642878437513">"音量"</string>
     <string name="musicfx_title" msgid="5458574743312283473">"サウンド効果"</string>
     <string name="ring_volume_title" msgid="4869034595079914541">"着信音と通知の音量"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"履歴の詳細"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"バッテリー使用量"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"過去 24 時間の使用状況を確認できます"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"前回のフル充電からの使用状況を表示する"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"前回のフル充電以降の使用を表示"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"アプリのバッテリー使用量"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"使用状況の詳細"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"消費電力の調整"</string>
@@ -2881,7 +2879,7 @@
     <string name="smart_battery_title" msgid="9095903608520254254">"アプリを自動的に管理"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"使用頻度の低いアプリによる電池の使用を制限します"</string>
     <string name="smart_battery_footer" msgid="8407121907452993645">"バッテリー使用量が多いと判断されたアプリは、バッテリー マネージャによって制限されます。制限されたアプリは正常に動作しない場合や、通知が遅れる可能性があります。"</string>
-    <string name="restricted_app_title" msgid="6585080822121007436">"アプリの制限"</string>
+    <string name="restricted_app_title" msgid="6585080822121007436">"アプリの利用制限"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="other">%1$d 個のアプリの電池使用を制限しています</item>
       <item quantity="one">%1$d 個のアプリの電池使用を制限しています</item>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"バッテリー使用量"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"フル充電以降の電池の使用状況"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"バッテリー使用状況の管理"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"合計: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> バックグラウンドでの使用: \n（前回のフル充電以降）"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"合計: <xliff:g id="TIME_0">^1</xliff:g> • バックグラウンドでの使用: <xliff:g id="TIME_1">^2</xliff:g>\n（前回のフル充電以降）"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"合計: <xliff:g id="TIME_0">^1</xliff:g> • バックグラウンドでの使用: <xliff:g id="TIME_1">^2</xliff:g>\n（過去 24 時間）"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"合計: <xliff:g id="TIME_0">^1</xliff:g> • バックグラウンド: <xliff:g id="TIME_1">^2</xliff:g>\n（<xliff:g id="TIME_PERIOD">^3</xliff:g>）"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"合計: 1 分未満（前回のフル充電以降）"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"合計: 1 分未満（前回のフル充電以降）"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"合計: 1 分未満（過去 24 時間）"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> の合計: 1 分未満"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"バックグラウンドでの使用: 1 分未満（前回のフル充電以降）"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"バックグラウンドでの使用: 1 分未満（前回のフル充電以降）"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"バックグラウンドでの使用: 1 分未満（過去 24 時間）"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> のバックグラウンドでの使用: 1 分未満"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"合計: <xliff:g id="TIME">^1</xliff:g>（前回のフル充電以降）"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"合計: <xliff:g id="TIME">^1</xliff:g>（前回のフル充電以降）"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"合計: <xliff:g id="TIME">^1</xliff:g>（過去 24 時間）"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> の合計: <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"バックグラウンドでの使用: <xliff:g id="TIME">^1</xliff:g>（前回のフル充電以降）"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"バックグラウンドでの使用: <xliff:g id="TIME">^1</xliff:g>（前回のフル充電以降）"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"バックグラウンドでの使用: <xliff:g id="TIME">^1</xliff:g>（過去 24 時間）"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> のバックグラウンドでの使用: <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"合計: <xliff:g id="TIME">^1</xliff:g> • バックグラウンドでの使用: 1 分未満\n（前回のフル充電以降）"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"合計: <xliff:g id="TIME">^1</xliff:g> • バックグラウンドでの使用: 1 分未満\n（前回のフル充電以降）"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"合計: <xliff:g id="TIME">^1</xliff:g> • バックグラウンドでの使用: 1 分未満\n（過去 24 時間）"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"合計: <xliff:g id="TIME_0">^1</xliff:g> • バックグラウンド: 1 分未満\n（<xliff:g id="TIME_PERIOD">^2</xliff:g>）"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"使用: なし（前回のフル充電以降）"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"使用なし（前回のフル充電以降）"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"使用: なし（過去 24 時間）"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"その他のユーザー"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"このデバイスから<xliff:g id="USER_NAME">%1$s</xliff:g>を削除"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ロック画面の設定"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ロック画面からユーザーを追加"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ホルダー装着時に管理者ユーザーに切り替える"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"自分を削除しますか？"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"このユーザーを削除しますか？"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"プロファイルを削除しますか？"</string>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 679bbc0..011a3b3 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"არასოდეს"</item>
-    <item msgid="5065465585332446709">"1 წუთის შემდეგ"</item>
-    <item msgid="622807566366131941">"5 წუთის შემდეგ"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index cf066dc..bbe1450 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"თქვენი სახის მოდელი სამუდამოდ და უსაფრთხოდ წაიშლება.\n\nწაშლის შემდეგ ტელეფონის განბლოკვისთვის თქვენი PIN-კოდი, ნიმუში ან პაროლი დაგჭირდებათ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ტელეფონის განსაბლოკად გამოიყენეთ სახით განბლოკვა"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"თითის ანაბეჭდი"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"თითის ანაბეჭდით განბლოკვის გამოყენებისას"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"თითის ანაბეჭდი სამსახ."</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ანაბეჭდების მართვა"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ანაბეჭდების გამოყენება"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"რეგისტრირებულია <xliff:g id="PERCENTAGE">%d</xliff:g> პროცენტი"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"მიმდინარეობს თითის ანაბეჭდის რეგისტრაცია, <xliff:g id="PERCENTAGE">%d</xliff:g> პროცენტი"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"თითის ანაბეჭდი დამატებულია"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ახლა უკვე შეგიძლიათ თითის ანაბეჭდის გამოყენება ტაბლეტის განსაბლოკად ან ვინაობის დასადასტურებლად, ისეთ შემთხვევებში, როცა აპებში შედიხართ ან შენაძენს ადასტურებთ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ახლა უკვე შეგიძლიათ თითის ანაბეჭდით ტაბლეტის განბლოკვა ან ვინაობის დადასტურება, როცა აპებში შედიხართ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ახლა უკვე შეგიძლიათ თითის ანაბეჭდით მოწყობილობის განბლოკვა ან ვინაობის დადასტურება, როცა აპებში შედიხართ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ახლა უკვე შეგიძლიათ თითის ანაბეჭდით ტელეფონის განბლოკვა ან ვინაობის დადასტურება, როცა აპებში შედიხართ"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"განბლოკვა მხოლოდ მაშინ, როცა ეკრანი ჩართულია"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"ეკრანი ჩართული უნდა იყოს, სანამ თითის ანაბეჭდით განბლოკავთ. ეს ამცირებს შემთხვევით განბლოკვას."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ეკრანის განბლოკვა"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"მოგვიანებით გაკეთება"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"აიღეთ თითი, შემდეგ კი ხელახლა შეეხეთ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"დაადეთ თითის ცალი მხარე სენსორს და გააჩერეთ ცოტა ხნით, შემდეგ კი დაადეთ მეორე მხარე"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ისტორიის დეტალები"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ბატარეის მოხმარება"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ბოლო 24 საათის მანძილზე მოხმარების ნახვა"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ბოლო სრული დატენვიდან მოხმარების ნახვა"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"გამოყენ. დეტალების ნახვა ბოლო სრული დამუხტ. შემდეგ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"აპლიკაციის ბატარეის გამოყენება"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"გამოყენების დეტალები"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ენერგიის მოხმარების მორგება"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ბატარეის მოხმარება"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"სრული დატენვიდან"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ბატარეის მოხმარების მართვა"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> სულ • <xliff:g id="TIME_1">^2</xliff:g> ფონურად\nბოლო სრული დატენვიდან"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> სულ • <xliff:g id="TIME_1">^2</xliff:g> ფონური\nბოლო სრული დამუხტვიდან"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"სულ <xliff:g id="TIME_0">^1</xliff:g> • ფონურად <xliff:g id="TIME_1">^2</xliff:g>\nბოლო 24 საათის განმავლობაში"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"სულ <xliff:g id="TIME_0">^1</xliff:g> • ფონურად<xliff:g id="TIME_1">^2</xliff:g>\n<xliff:g id="TIME_PERIOD">^3</xliff:g> პერიოდის განმავლობაში"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"სულ წუთზე ნაკლები ბოლო სრული დატენვიდან"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"სულ წუთზე ნაკლები ბოლო სრული დამუხტვიდან"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"სულ წუთზე ნაკლები ბოლო 24 საათის განმავლობაში"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"სულ წუთზე ნაკლები <xliff:g id="TIME_PERIOD">^1</xliff:g>-ის განმავლობაში"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ფონურად წუთზე ნაკლები ბოლო სრული დატენვიდან"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ფონური ბოლო სრული დამუხტვიდან წუთზე ნაკლები დროის განმავლობაში"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ფონურად წუთზე ნაკლები ბოლო 24 საათის განმავლობაში"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"ფონურად წუთზე ნაკლები <xliff:g id="TIME_PERIOD">^1</xliff:g> პერიოდის განმავლობაში"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> სულ ბოლო სრული დატენვიდან"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"სულ <xliff:g id="TIME">^1</xliff:g> ბოლო სრული დამუხტვიდან"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"სულ <xliff:g id="TIME">^1</xliff:g> ბოლო 24 საათის განმავლობაში"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"სულ <xliff:g id="TIME_0">^1</xliff:g> <xliff:g id="TIME_PERIOD">^2</xliff:g>-ის განმავლობაში"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> ფონურად ბოლო სრული დატენვის შემდეგ"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> ფონური ბოლო სრული დამუხტვის შემდეგ"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> ფონურად ბოლო 24 საათში"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> ფონურად <xliff:g id="TIME_PERIOD">^2</xliff:g> პერიოდის განმავლობაში"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> სულ • ფონურად წუთზე ნაკლები\nბოლო სრული დატენვიდან"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> სულ • ფონური ერთ წუთზე ნაკლები\nბოლო სრული დამუხტვიდან"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"სულ <xliff:g id="TIME">^1</xliff:g> • ფონურად წუთზე ნაკლები\nბოლო 24 საათის განმავლობაში"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"სულ <xliff:g id="TIME_0">^1</xliff:g> • ფონურად წუთზე ნაკლები\n<xliff:g id="TIME_PERIOD">^2</xliff:g> პერიოდის განმავლობაში"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ბოლო სრული დატენვის შემდეგ მოხმარება არ ფიქსირდება"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"სრული დამუხტვის შემდეგ არ გამოყენებულა"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ბოლო 24 საათში გამოყენება არ მომხდარა"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"სხვა მომხმარებლები"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"წაშალე <xliff:g id="USER_NAME">%1$s</xliff:g> ამ მოწყობილობიდან"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ჩაკეტილი ეკრანის პარამეტრები"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ჩაკეტილი ეკრანიდან მომხმარებლების დამატება"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ადმინისტრატორ მომხმარებელზე გადართვა ჩამაგრებისას"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"წავშალო თქვენი ანგარიში?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"წაიშალოს ეს მომხმარებელი?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"გსურთ ამ პროფილის წაშლა?"</string>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index bbc2339..203efd8 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Ешқашан"</item>
-    <item msgid="5065465585332446709">"1 минуттан кейін"</item>
-    <item msgid="622807566366131941">"5 минуттан кейін"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1fc729d..34e48c1 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Бет үлгісі біржола әрі қауіпсіз жойылады.\n\nОны жойған соң, телефон құлпын ашу үшін PIN кодын, өрнекті немесе құпия сөзді пайдалану керек болады."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Телефон құлпын ашу үшін бет тану функциясын пайдаланыңыз."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Саусақ ізі"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Саусақ ізімен ашуды қолданған кезде"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Жұмысқа арналған саусақ ізі"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Саусақ таңбасын бас-у"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Саусақ таңбасын пайд-у"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> пайыз тіркелді"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Саусақ ізі тіркелуде: <xliff:g id="PERCENTAGE">%d</xliff:g> пайыз."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Саусақ ізі енгізілді"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Енді планшет құлпын ашу немесе жеке басыңызды растау үшін (мысалы, қолданбаларға кіргенде немесе бірдеңе сатып алғанда) саусақ ізін пайдалана аласыз."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Енді планшет құлпын ашу немесе жеке басыңызды растау үшін (мысалы, қолданбаларға кіргенде) саусақ ізін пайдалана аласыз."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Енді құрылғы құлпын ашу немесе жеке басыңызды растау үшін (мысалы, қолданбаларға кіргенде) саусақ ізін пайдалана аласыз."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Енді телефон құлпын ашу немесе жеке басыңызды растау үшін (мысалы, қолданбаларға кіргенде) саусақ ізін пайдалана аласыз."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Экран қосулы кезде ғана құлпын ашу"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Саусақ ізімен құлпын ашпас бұрын экран қосулы болуы керек. Мұндайда кездейсоқ ашып қою сирек болады."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Экран құлпын ашу"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Кейінірек"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Саусағыңызды алып, қайта түртіңіз."</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Саусақ ізінің бір жағын датчикке қойыңыз, сосын екінші жағына ауысыңыз."</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Ұйықтау уақыты режимі қосулы болғандықтан, қолжетімді емес."</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Скринсейверді пайдалану"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Зарядтау кезінде немесе қондыру станциясында"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Қондырылғанда және зарядталғанда"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Зарядтау кезінде"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Қондыру станциясында"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Ешқашан"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Тарих егжей-тегжейі"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Батарея шығыны"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Соңғы 24 сағат шығынын көру"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Толық зарядталғаннан бергі шығынды көру"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Соңғы толық зарядталғаннан бергі пайдалану мәліметін көру"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Қолданбаның батарея шығындау көрсеткіші"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Қолдану деректері"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Қуат қолданысын бейімдеу"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Батарея шығыны"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Толық зарядталғаннан кейін"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Батарея шығынын қадағалау"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Соңғы толық зарядталғаннан бері\nбарлығы: <xliff:g id="TIME_0">^1</xliff:g> • фондық режимде: <xliff:g id="TIME_1">^2</xliff:g>."</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Соңғы толық зарядталғаннан бергі\nжалпы пайдалану уақыты – <xliff:g id="TIME_0">^1</xliff:g>, фондық режимдегісі – <xliff:g id="TIME_1">^2</xliff:g>."</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Соңғы 24 сағатта\nбарлығы: <xliff:g id="TIME_0">^1</xliff:g> • фондық режимде: <xliff:g id="TIME_1">^2</xliff:g>."</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_PERIOD">^3</xliff:g> аралығында\n барлығы: <xliff:g id="TIME_0">^1</xliff:g> • фондық режимде: <xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Соңғы толық зарядталғаннан бері барлығы: 1 минуттан кем."</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Соңғы толық зарядталғаннан бергі жалпы пайдалану уақыты бір минуттан аз."</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Соңғы 24 сағатта барлығы: 1 минуттан кем."</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> аралығында барлығы: 1 минуттан кем."</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Соңғы толық зарядталғаннан бері фондық режимде пайдаланылу уақыты: 1 минуттан кем."</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Соңғы толық зарядталғаннан бергі фондық режимде пайдалану уақыты бір минуттан аз."</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Соңғы 24 сағатта фондық режимде пайдаланылу уақыты: 1 минуттан кем."</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> аралығында фондық режимде пайдаланылу уақыты: 1 минуттан кем."</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Соңғы толық зарядталғаннан бері барлығы: <xliff:g id="TIME">^1</xliff:g>."</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Соңғы толық зарядталғаннан бергі жалпы пайдалану уақыты – <xliff:g id="TIME">^1</xliff:g>."</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Соңғы 24 сағатта барлығы: <xliff:g id="TIME">^1</xliff:g>."</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> аралығында барлығы: <xliff:g id="TIME_0">^1</xliff:g>."</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Соңғы толық зарядталғаннан бері фондық режимде пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>."</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Соңғы толық зарядталғаннан бері <xliff:g id="TIME">^1</xliff:g> фондық режимде болды."</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Соңғы 24 сағатта фондық режимде пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>."</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> аралығында фондық режимде пайдаланылу уақыты: <xliff:g id="TIME_0">^1</xliff:g>."</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Соңғы толық зарядталғаннан бері\nбарлығы: <xliff:g id="TIME">^1</xliff:g> • фондық режимде: 1 минуттан кем."</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Соңғы толық зарядталғаннан бергі\nжалпы пайдалану уақыты – <xliff:g id="TIME">^1</xliff:g>, фондық режимдегісі бір минуттан аз."</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Соңғы 24 сағатта\nбарлығы: <xliff:g id="TIME">^1</xliff:g> • фондық режимде: 1 минуттан кем."</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_PERIOD">^2</xliff:g> аралығында\nбарлығы: <xliff:g id="TIME_0">^1</xliff:g> • фондық режимде: 1 минуттан кем"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Соңғы толық зарядталғаннан бері пайдаланылмады."</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Соңғы толық зарядталғаннан бері пайдаланылмады."</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Соңғы 24 сағатта пайдаланылмады."</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Басқа пайдаланушылар"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> осы құралдан жою"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Құлып экранының параметрлері"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Құлыптаулы экраннан пайдаланушыларды қосу"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Қондырылғанда әкімші мүмкіндіктері берілген пайдаланушыға ауысу"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Өзіңізді жоясыз ба?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Пайдаланушы жойылсын ба?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Осы профил. жою керек пе?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Сұрауыңыз бойынша Android бұл қолданбаның хабарландыруларын көрсетпейді."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Сұрауыңыз бойынша Android мұндай хабарландыруларды көрсетпейді"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай хабарландырулар тобын бөгейді"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Бұл қолданба хабарландырулар жібермейді."</string>
     <string name="notification_channels" msgid="1502969522886493799">"Санаттар"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Басқа"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index ecfd8c1..f107396 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"កុំឱ្យសោះ"</item>
-    <item msgid="5065465585332446709">"បន្ទាប់ពី 1 នាទី"</item>
-    <item msgid="622807566366131941">"បន្ទាប់ពី 5 នាទី"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b491997..9e5d61c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"គំរូមុខ​របស់អ្នក​នឹងត្រូវលុប​ដោយសុវត្ថិភាព​ជាអចិន្ត្រៃយ៍។\n\nបន្ទាប់ពី​លុបហើយ អ្នកនឹង​ត្រូវការកូដ PIN, លំនាំ ឬពាក្យសម្ងាត់​របស់អ្នក ដើម្បីដោះសោ​ទូរសព្ទ​របស់អ្នក។"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ប្រើ​ការដោះសោ​តាមទម្រង់​មុខ ដើម្បី​ដោះសោ​ទូរសព្ទរបស់អ្នក"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ស្នាមម្រាមដៃ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"នៅពេលប្រើប្រាស់ការដោះសោ​ដោយប្រើ​ស្នាមម្រាមដៃ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ស្នាមម្រាមដៃសម្រាប់ការងារ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"គ្រប់គ្រងស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ប្រើស្នាមម្រាមដៃសម្រាប់"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"ចុះឈ្មោះបាន <xliff:g id="PERCENTAGE">%d</xliff:g> ភាគរយ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"កំពុងចុះឈ្មោះ​ស្នាមម្រាមដៃ <xliff:g id="PERCENTAGE">%d</xliff:g> ភាគរយ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"បានបញ្ចូល​ស្នាមម្រាមដៃ​រួចហើយ"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ឥឡូវនេះ អ្នកអាចប្រើ​ស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោ​ថេប្លេតរបស់អ្នក ឬផ្ទៀងផ្ទាត់​ថាជាអ្នក ដូចជានៅពេលអ្នក​ចូលកម្មវិធី ឬយល់ព្រមលើ​ការទិញជាដើម"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ឥឡូវនេះ អ្នកអាចប្រើ​ស្នាមម្រាមដៃ​របស់អ្នក ដើម្បីដោះសោ​ថេប្លេតរបស់អ្នក ឬផ្ទៀងផ្ទាត់ថាជាអ្នក ដូចជា នៅពេលអ្នក​ចូលកម្មវិធីជាដើម"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ឥឡូវនេះ អ្នកអាចប្រើ​ស្នាមម្រាមដៃ​របស់អ្នក ដើម្បីដោះសោឧបករណ៍របស់អ្នក ឬផ្ទៀងផ្ទាត់ថាជាអ្នក ដូចជា នៅពេលអ្នក​ចូលកម្មវិធីជាដើម"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ឥឡូវនេះ អ្នកអាចប្រើ​ស្នាមម្រាមដៃ​របស់អ្នក ដើម្បីដោះសោ​ទូរសព្ទរបស់អ្នក ឬផ្ទៀងផ្ទាត់ថាជាអ្នក ដូចជា នៅពេលអ្នក​ចូលកម្មវិធីជាដើម"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ដោះសោតែនៅពេលដែលអេក្រង់បើកប៉ុណ្ណោះ"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"អេក្រង់ត្រូវតែបើក មុនពេលអ្នកអាចដោះសោដោយប្រើស្នាមម្រាមដៃរបស់អ្នក។ ការធ្វើបែបនេះធ្វើឱ្យការដោះសោដោយចៃដន្យមិនទំនងជាកើតឡើង។"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"អេក្រង់ ដោះសោ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ធ្វើ​នៅ​ពេលក្រោយ"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ដកចេញ រួចចុច​ម្តងទៀត"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"ដាក់​ផ្នែកចំហៀង​នៃស្នាមម្រាមដៃ​របស់អ្នក​នៅលើ​ឧបករណ៍​ចាប់ស្នាមម្រាមដៃ​ឱ្យជាប់ រួចប្ដូរទៅ​ផ្នែកម្ខាងទៀត"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"មិនអាច​ប្រើបានទេ ដោយសារ​បើកមុខងារ​ម៉ោងគេង"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"ប្រើធាតុ​រក្សា​អេក្រង់"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"ពេលសាកថ្ម ឬភ្ជាប់"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ខណៈពេលភ្ជាប់ និងសាកថ្ម"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"ពេលសាកថ្ម"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ពេល​​ភ្ជាប់"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"កុំឲ្យសោះ"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ព័ត៌មាន​លម្អិត​ប្រវត្តិ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ការប្រើប្រាស់ថ្ម"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"មើលការប្រើ 24 ម៉ោងចុងក្រោយ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"មើលការប្រើប្រាស់ពីការសាកថ្មពេញចុងក្រោយ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"មើលការប្រើប្រាស់តាំងពីសាកថ្មពេញចុងក្រោយ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ការប្រើប្រាស់ថ្មដោយកម្មវិធី"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ព័ត៌មាន​លម្អិត​នៃការ​ប្រើ"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"កែ​ការ​ប្រើ​ថាមពល"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ការប្រើប្រាស់ថ្ម"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ចាប់តាំងពីសាកថ្មពេញ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"គ្រប់គ្រងការប្រើប្រាស់ថ្ម"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"សរុប <xliff:g id="TIME_0">^1</xliff:g> • ប្រើ​នៅផ្ទៃខាងក្រោយ <xliff:g id="TIME_1">^2</xliff:g>\nតាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"សរុប <xliff:g id="TIME_0">^1</xliff:g> • ប្រើនៅផ្ទៃខាងក្រោយ <xliff:g id="TIME_1">^2</xliff:g> \nចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"សរុប <xliff:g id="TIME_0">^1</xliff:g> • ប្រើនៅផ្ទៃខាងក្រោយ <xliff:g id="TIME_1">^2</xliff:g>\nក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"សរុប <xliff:g id="TIME_0">^1</xliff:g> • ប្រើនៅផ្ទៃខាងក្រោយ <xliff:g id="TIME_1">^2</xliff:g>\nសម្រាប់ <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"សរុប​តិចជាងមួយនាទី​តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"សរុប​តិចជាងមួយនាទី​ចាប់តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"សរុបតិចជាងមួយនាទីក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"សរុបតិចជាងមួយនាទីសម្រាប់ <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ប្រើ​នៅផ្ទៃខាងក្រោយ​តិចជាងមួយនាទី តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ប្រើ​នៅផ្ទៃខាងក្រោយ​តិចជាងមួយនាទីចាប់តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ប្រើនៅ​ផ្ទៃខាងក្រោយតិចជាង​មួយនាទី​ក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"ប្រើ​នៅផ្ទៃខាងក្រោយតិចជាង​មួយនាទីចន្លោះ <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"សរុប <xliff:g id="TIME">^1</xliff:g> តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"សរុប <xliff:g id="TIME">^1</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"សរុប <xliff:g id="TIME">^1</xliff:g> ក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"សរុប <xliff:g id="TIME_0">^1</xliff:g>​ចន្លោះ <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"ប្រើនៅផ្ទៃ​ខាងក្រោយ <xliff:g id="TIME">^1</xliff:g> តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"ប្រើនៅផ្ទៃខាងក្រោយ <xliff:g id="TIME">^1</xliff:g> ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ប្រើនៅ​ផ្ទៃខាងក្រោយ <xliff:g id="TIME">^1</xliff:g> ក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"បានប្រើ​ផ្ទៃខាងក្រោយ <xliff:g id="TIME_0">^1</xliff:g> សម្រាប់ <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"សរុប <xliff:g id="TIME">^1</xliff:g> • ប្រើនៅផ្ទៃ​ខាងក្រោយ​តិចជាងមួយនាទី\nតាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"សរុប <xliff:g id="TIME">^1</xliff:g> • ប្រើនៅផ្ទៃខាងក្រោយតិចជាងមួយនាទី\nចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"សរុប <xliff:g id="TIME">^1</xliff:g> • ប្រើនៅ​ផ្ទៃខាងក្រោយ​តិចជាងមួយនាទី\nក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"សរុប <xliff:g id="TIME_0">^1</xliff:g> • ប្រើនៅ​ផ្ទៃខាងក្រោយ​តិចជាងមួយនាទី\nសម្រាប់ <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"មិនមាន​ការប្រើប្រាស់ទេ​តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"មិនមានការប្រើប្រាស់ចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"មិនមាន​ការប្រើប្រាស់ទេ​ក្នុងរយៈពេល 24 ម៉ោងចុងក្រោយ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"អ្នក​ប្រើ​ប្រាស់ផ្សេងទៀត"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"លុប <xliff:g id="USER_NAME">%1$s</xliff:g> ពី​ឧបករណ៍​នេះ"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ការកំណត់អេក្រង់ចាក់សោ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"បញ្ចូល​អ្នក​ប្រើប្រាស់​ពី​អេក្រង់​ចាក់សោ"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ប្ដូរទៅអ្នកប្រើប្រាស់ដែលជាអ្នកគ្រប់គ្រងពេលភ្ជាប់"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"លុប​ខ្លួន​ឯង​ផ្ទាល់?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"លុបអ្នកប្រើប្រាស់​នេះ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"លុប​ប្រវត្តិ​រូប​នេះ?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"តាមសំណើ​របស់អ្នក Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"កម្មវិធីនេះមិនផ្ញើការជូនដំណឹងទេ"</string>
     <string name="notification_channels" msgid="1502969522886493799">"ប្រភេទ"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"ផ្សេងៗ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 7f05c43..ecbfbf8 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ಎಂದಿಗೂ ಬೇಡ"</item>
-    <item msgid="5065465585332446709">"1 ನಿಮಿಷದ ನಂತರ"</item>
-    <item msgid="622807566366131941">"5 ನಿಮಿಷಗಳ ನಂತರ"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index c0d87d0..12ad9fa 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"ನಿಮ್ಮ ಫೇಸ್ ಮಾಡೆಲ್ ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ಮತ್ತು ಸುರಕ್ಷಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ.\n\nಅಳಿಸಿದ ನಂತರ, ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಪಿನ್, ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿದೆ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್‌ಲಾಕ್ ಬಳಸುವಾಗ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ಕೆಲಸಕ್ಕಾಗಿ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ಬೆರಳಚ್ಚು ನಿರ್ವ."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ಇದಕ್ಕಾಗಿ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"ಶೇಕಡಾ <xliff:g id="PERCENTAGE">%d</xliff:g> ನೋಂದಣಿ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ನೋಂದಣಿ ಶೇಕಡಾ <xliff:g id="PERCENTAGE">%d</xliff:g> ಆಗಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಲಾಗಿದೆ"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿದಾಗ ಅಥವಾ ಖರೀದಿಯನ್ನು ಅನುಮೋದಿಸಿದಾಗ ನಿಮ್ಮ ಗುರುತನ್ನು ದೃಢೀಕರಿಸಲು ಈಗ ನೀವು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಬಹುದು"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಂತೆಯೇ, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನಿಮ್ಮ ಗುರುತನ್ನು ದೃಢೀಕರಿಸಲು ನೀವು ಈಗ ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಬಹುದು"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಂತೆಯೇ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನಿಮ್ಮ ಗುರುತನ್ನು ದೃಢೀಕರಿಸಲು ನೀವು ಈಗ ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಬಹುದು"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಂತೆಯೇ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನಿಮ್ಮ ಗುರುತನ್ನು ದೃಢೀಕರಿಸಲು ನೀವು ಈಗ ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಬಹುದು"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ಸ್ಕ್ರೀನ್ ಆನ್ ಆಗಿರುವಾಗ ಮಾತ್ರ ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಮೊದಲು ಸ್ಕ್ರೀನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು. ಇದು ಆಕಸ್ಮಿಕ ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಸಾಧ್ಯತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡುತ್ತದೆ."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ಸ್ಕ್ರೀನ್, ಅನ್‌ಲಾಕ್‌"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ನಂತರ ಮಾಡಿ"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ಎತ್ತಿರಿ, ನಂತರ ಪುನಃ ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ಒಂದು ಬದಿಯನ್ನು ಇರಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ, ನಂತರ ಇನ್ನೊಂದು ಬದಿಗೆ ಬದಲಿಸಿ"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ಇತಿಹಾಸದ ವಿವರಗಳು"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿನ ಬಳಕೆಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಬಳಕೆ ವೀಕ್ಷಿಸಿ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ನಿಂದ ಬಳಕೆ ವೀಕ್ಷಿಸಿ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ಆ್ಯಪ್‌ನ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME_0">^1</xliff:g> • ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ <xliff:g id="TIME_1">^2</xliff:g> ಕಾಲ \n ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME_0">^1</xliff:g> • ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ <xliff:g id="TIME_1">^2</xliff:g> ಕಾಲ \n ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME_0">^1</xliff:g> • ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ <xliff:g id="TIME_1">^2</xliff:g> ಕಾಲ \n ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> ಅವಧಿಯಲ್ಲಿ <xliff:g id="TIME_1">^2</xliff:g> ಕಾಲ ಹಿನ್ನೆಲೆಯಲ್ಲಿ\n ಬಳಸಲಾಗಿದೆ"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಒಟ್ಟು ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಒಟ್ಟು ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ ಒಟ್ಟು ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ರ ಸಮಯದಲ್ಲಿ ಒಟ್ಟು ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಬಳಸಲಾಗಿದೆ"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ಅವಧಿಯಲ್ಲಿ ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ <xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ <xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ <xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ರ ಸಮಯದಲ್ಲಿ ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ <xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ <xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ <xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ಅವಧಿಯಲ್ಲಿ <xliff:g id="TIME_0">^1</xliff:g> ಕಾಲ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME">^1</xliff:g> • ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ \nಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME">^1</xliff:g> • ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ\nಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME">^1</xliff:g> • ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ \nಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"ಒಟ್ಟು ಬಳಕೆ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> ಅವಧಿಯಲ್ಲಿ ಒಂದು ನಿಮಿಷಕ್ಕೂ\n ಕಡಿಮೆ ಸಮಯ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದಾಗಿನಿಂದ ಯಾವುದೇ ಬಳಕೆಯಾಗಿಲ್ಲ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ನಿಂದ ಯಾವುದೇ ಬಳಕೆ ಇಲ್ಲ"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ಕಳೆದ 24 ಗಂಟೆಗಳಲ್ಲಿ ಯಾವುದೇ ಬಳಕೆಯಾಗಿಲ್ಲ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ಇತರ ಬಳಕೆದಾರರು"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ಈ ಸಾಧನದಿಂದ <xliff:g id="USER_NAME">%1$s</xliff:g> ಅಳಿಸಿ"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ಪರದೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಲಾಕ್ ಮಾಡಿ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಿಂದ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ಡಾಕ್ ಮಾಡಿದಾಗ ನಿರ್ವಾಹಕ ಬಳಕೆದಾರರಿಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ನಿಮ್ಮನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ಈ ಪ್ರೊಫೈಲ್ ತೆಗೆದುಹಾಕುವುದೇ?"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index bbd395b..d2e9a0c 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"사용 안함"</item>
-    <item msgid="5065465585332446709">"1분 후"</item>
-    <item msgid="622807566366131941">"5분 후"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7193f20..bafa7b0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"얼굴 모델이 영구적으로 안전하게 삭제됩니다.\n\n삭제 후 휴대전화를 잠금 해제하려면 PIN, 패턴 또는 비밀번호가 필요합니다."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"얼굴 인식 잠금 해제로 휴대전화를 잠금 해제하세요"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"지문"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"지문 잠금 해제 사용 시"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"업무 시 사용할 지문"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"지문 관리"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"지문을 사용할 항목"</string>
@@ -595,16 +594,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"지문 추가됨"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"이제 지문을 사용하여 태블릿을 잠금 해제하거나 앱 로그인, 구매 승인 등을 위해 본인 인증을 진행할 수 있습니다."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"이제 지문을 사용하여 태블릿을 잠금 해제하거나 앱 로그인 등을 위해 본인을 인증할 수 있습니다."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"이제 지문을 사용하여 기기를 잠금 해제하거나 앱 로그인 등을 위해 본인을 인증할 수 있습니다."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"이제 지문을 사용하여 휴대전화를 잠금 해제하거나 앱 로그인 등을 위해 본인을 인증할 수 있습니다."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"화면이 켜져 있을 때만 잠금 해제"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"지문으로 잠금 해제하려면 먼저 화면이 켜져 있어야 합니다. 이를 설정하면 실수로 잠금 해제될 가능성이 작아집니다."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"화면 잠금 해제"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"나중에"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"손가락을 뗀 후 다시 터치하세요"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"지문의 한쪽을 센서에 올리고 잠시 기다린 후 다른 쪽으로 돌리세요"</string>
@@ -1529,8 +1527,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"취침 모드가 켜져 있으므로 사용할 수 없습니다."</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"화면 보호기 사용"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"충전 또는 도킹하는 동안"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"도킹 및 충전 중"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"충전하는 동안"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"도킹하는 동안"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"사용 안함"</string>
@@ -2820,7 +2817,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"기록 세부정보"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"배터리 사용량"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"지난 24시간 동안의 사용량 보기"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"마지막으로 충전을 완료한 이후의 사용량 보기"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"마지막으로 완전히 충전한 이후 사용량"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"앱 배터리 사용량"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"사용 세부정보"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"전원 사용 조절"</string>
@@ -3001,25 +2998,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"배터리 사용량"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"충전 완료 후"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"배터리 사용량 관리"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"총 <xliff:g id="TIME_0">^1</xliff:g> • 마지막으로 완전히 충전한 이후\n백그라운드에서 <xliff:g id="TIME_1">^2</xliff:g> 사용"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"마지막으로 완전히 충전한 이후\n총 <xliff:g id="TIME_0">^1</xliff:g> • 백그라운드 <xliff:g id="TIME_1">^2</xliff:g> 사용"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"총 <xliff:g id="TIME_0">^1</xliff:g> • 지난 24시간 동안\n백그라운드에서 <xliff:g id="TIME_1">^2</xliff:g> 사용"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"총 <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> 동안\n백그라운드에서 <xliff:g id="TIME_1">^2</xliff:g> 사용"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"마지막으로 완전히 충전한 이후 총 1분 미만 사용"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"마지막으로 완전히 충전한 이후 총 1분 미만 사용"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"지난 24시간 동안 총 1분 미만 사용"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g>의 총 사용 시간: 1분 미만"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"마지막으로 완전히 충전한 이후 백그라운드에서 1분 미만 사용"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"마지막으로 완전히 충전한 이후 백그라운드에서 1분 미만 사용"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"지난 24시간 동안 백그라운드에서 1분 미만 사용"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> 동안 백그라운드에서 1분 미만 사용"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"마지막으로 완전히 충전한 이후 총 <xliff:g id="TIME">^1</xliff:g> 사용"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"마지막으로 완전히 충전한 이후 총 <xliff:g id="TIME">^1</xliff:g> 사용"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"지난 24시간 동안 총 <xliff:g id="TIME">^1</xliff:g> 사용"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>의 총 사용 시간: <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"마지막으로 완전히 충전한 이후 백그라운드에서 <xliff:g id="TIME">^1</xliff:g> 사용"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"마지막으로 완전히 충전한 이후 백그라운드에서 <xliff:g id="TIME">^1</xliff:g> 사용"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"지난 24시간 동안 백그라운드에서 <xliff:g id="TIME">^1</xliff:g> 사용"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> 동안 백드라운드에서 <xliff:g id="TIME_0">^1</xliff:g> 사용"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"총 <xliff:g id="TIME">^1</xliff:g> • 마지막으로 완전히 충전한 이후 백그라운드에서\n1분 미만 사용"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"마지막으로 완전히 충전한 이후\n총 <xliff:g id="TIME">^1</xliff:g> • 백그라운드 1분 미만 사용"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"총 <xliff:g id="TIME">^1</xliff:g> • 지난 24시간 동안\n백그라운드에서 1분 미만 사용"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"총 <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> 동안\n백그라운드에서 1분 미만 사용"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"마지막으로 완전히 충전한 이후 사용 안 함"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"마지막으로 완전히 충전한 이후 사용 안함"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"지난 24시간 동안 사용 안 함"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"다른 사용자"</string>
@@ -3499,7 +3496,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"이 기기에서 <xliff:g id="USER_NAME">%1$s</xliff:g>님 삭제"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"잠금 화면 설정"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"잠금 화면에서 사용자 추가"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"도킹 시 관리자로 전환"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"본인을 삭제하시겠습니까?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"사용자를 삭제하시겠습니까?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"프로필을 삭제할까요?"</string>
@@ -4212,8 +4210,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"사용자의 요청에 따라 Android에서 기기에 이 앱의 알림이 표시되지 않도록 차단하고 있습니다"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"사용자의 요청에 따라 Android에서 기기에 이 카테고리의 알림이 표시되지 않도록 차단하고 있습니다"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"사용자의 요청에 따라 Android에서 기기에 이 그룹의 알림이 표시되지 않도록 차단하고 있습니다"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"이 앱은 알림을 전송하지 않습니다."</string>
     <string name="notification_channels" msgid="1502969522886493799">"카테고리"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"기타"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index e8df5ab..999fb89 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Эч качан"</item>
-    <item msgid="5065465585332446709">"1 мүнөттөн кийин"</item>
-    <item msgid="622807566366131941">"5 мүнөттөн кийин"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 841cc87..453cda0 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Жүзүңүздүн үлгүсү биротоло өчүрүлөт.\n\nӨчүрүлгөндөн кийин телефонуңуздун кулпусун ачуу үчүн манжаңыздын изи, PIN код, графикалык ачкыч же сырсөз керек болот."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Телефонуңузду Жүзүнөн таанып ачуу функциясы менен ачыңыз"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Манжа изи"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Манжа изи менен ачуу колдонулганда"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Жумуш үчүн манжа изи"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Манжа издерин башкаруу"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Манжа издерин колдонуу"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> пайыз катталды"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Манжа изи катталууда: <xliff:g id="PERCENTAGE">%d</xliff:g> пайыз"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Манжа изи кошулду"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Эми манжаңыздын изи менен планшетиңиздин кулпусун ачып же колдонмолорго кирүүдө өзүңүздү же сатып алууну ырастай аласыз"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Эми манжаңыздын изи менен планшетиңиздин кулпусун ачып же колдонмолорго кирүүдө өзүңүздү ырастайсыз"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Эми манжаңыздын изи менен түзмөгүңүздүн кулпусун ачып же колдонмолорго кирүүдө өзүңүздү ырастайсыз"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Эми манжаңыздын изи менен телефонуңуздун кулпусун ачып же колдонмолорго кирүүдө өзүңүздү ырастайсыз"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Кулпусу экран күйүп турганда гана ачылсын"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Кулпуну манжа изи менен ачуу үчүн экран күйгүзүлүшү керек. Бул кулпуну кокустан ачып алуунун алдын алат."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Экран, кулпуну ачуу"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Азыр эмес"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Көтөрүп, кайра тийип коюңуз"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Манжаңызды сенсорго капталдатып коюп, кармап туруңуз, андан кийин башка капталдарын коюңуз"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Уйку режиминде иштебейт"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Көшөгөнү колдонуу"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Кубатталып жатканда же док-станцияга туташканда"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Туташып жана кубатталып жатканда"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Кубатталып жатканда"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Док-станцияда"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Эч качан"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Таржымалдын чоо-жайы"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Батареянын колдонулушу"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Акыркы 24 саатта колдонулганын көрөсүз"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Акыркы жолу кубатталгандан бери колдонулушун көрүү"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Акыркы жолу толук кубатталгандан бери колдонулушун көрүү"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Колдонмонун батареяны колдонулушу"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Чоо-жайын колдонуу"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Кубат сарпталышын тууралоо"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Батареянын керектелиши"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Толук кубатталгандан бери"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Батареянын керектелишин башкаруу"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Жалпысынан <xliff:g id="TIME_0">^1</xliff:g> • акыркы жолу толук кубатталгандан бери\nфондо <xliff:g id="TIME_1">^2</xliff:g> колдонулган"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Жалпысынан <xliff:g id="TIME_0">^1</xliff:g> • акыркы жолу толук кубатталгандан бери фондо\n<xliff:g id="TIME_1">^2</xliff:g> колдонулду"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Жалпысынан <xliff:g id="TIME_0">^1</xliff:g> • акыркы 24 сааттын ичинде\nфондо <xliff:g id="TIME_1">^2</xliff:g> колдонулган"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Жалпысынан <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> аралыгында <xliff:g id="TIME_1">^2</xliff:g>\nфондо колдонулган"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Акыркы жолу толук кубатталгандан бери жалпысынан 1 мүнөткө жетпейт"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Акыркы жолу толук кубатталгандан бери жалпысынан 1 мүнөткө жетпеген убакыт колдонулду"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Акыркы 24 сааттын ичинде жалпысынан 1 мүнөткө жетпейт"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> чейин жалпысынан 1 мүнөткө жетпейт"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Акыркы жолу толук кубатталгандан бери фондо 1 мүнөткө жетпейт убакытка колдонулган"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Акыркы жолу толук кубатталгандан бери фондо 1 мүнөткө жетпеген убакыт колдонулду"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Акыркы 24 сааттын ичинде фондо 1 мүнөткө жетпеген убакыт колдонулду"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> аралыгында 1 мүнөткө жетпеген убакытта фондо колдонулган"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Акыркы жолу толук кубатталгандан бери жалпысынан <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Акыркы жолу толук кубатталгандан бери жалпысынан <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Акыркы 24 сааттын ичинде жалпысынан <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> чейин жалпысынан <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Акыркы жолу толук кубатталгандан бери фондо <xliff:g id="TIME">^1</xliff:g> колдонулган"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Акыркы жолу толук кубатталгандан бери фондо <xliff:g id="TIME">^1</xliff:g> колдонулду"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Соңку 24 сааттын ичинде фондо <xliff:g id="TIME">^1</xliff:g> колдонулду"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> аралыгында <xliff:g id="TIME_0">^1</xliff:g> фондо колдонулган"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Жалпысынан <xliff:g id="TIME">^1</xliff:g> • акыркы жолу толук кубатталгандан бери\n1 мүнөткө жетпеген убакытта фондо колдонулган"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Жалпысынан <xliff:g id="TIME">^1</xliff:g> • акыркы жолу толук кубатталгандан бери\nфондо 1 мүнөткө жетпеген убакыт колдонулду"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Жалпысынан <xliff:g id="TIME">^1</xliff:g> • акыркы 24 сааттын ичинде\n1 мүнөткө жетпеген убакытта фондо колдонулган"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Жалпысынан <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> аралыгында\n1 мүнөткө жетпеген убакытта фондо колдонулган"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Акыркы жолу толук кубатталгандан бери колдонулган жок"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Акыркы жолу толук кубатталгандан бери колдонула элек"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Акыркы 24 сааттын ичинде колдонулган жок"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Башка колдонуучулар"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> бул түзмөктөн жок кылуу"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Экранды кулпулоо параметрлери"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Кулпуланган экрандан колдонуучуларды кошуу"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Туташтырылганда админге которулуңуз"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Өзүңүздү жок кылалыбы?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Бул колдонуучуну өчүрөсүзбү?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Профилди алып салалыбы?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Өтүнүчүңүз боюнча Android бул колдонмонун билдирмелерин бул түзмөктө көрсөтпөй, жашырып жатат"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Суранычыңыз боюнча Android ушул категориядагы билдирмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Суранычыңыз боюнча Android ушул категориядагы билдирмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Бул колдонмо билдирмелерди жөнөтпөйт"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Категориялар"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Башка"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -5883,7 +5880,7 @@
     <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"Убакытты, аба ырайын же башка маалыматты көшөгөдө көрсөтүү"</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"Дагы параметрлер"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"Көшөгөнү тандаңыз"</string>
-    <string name="dream_setup_description" msgid="7508547154038580296">"Планшет туташтырылып турганда анын экранында эмне көрсөтүлөрүн тандаңыз. Көшөгө колдонулганда түзмөктүн батареясы көбүрөөк сарпталышы мүмкүн."</string>
+    <string name="dream_setup_description" msgid="7508547154038580296">"Планшет док бекетке туташып турганда экранда эмне көрүнөрүн тандаңыз. Көшөгө иштетилгенде, түзмөк көбүрөөк кубат керектеши мүмкүн."</string>
     <string name="customize_button_title" msgid="1110284655990203359">"Ыңгайлаштыруу"</string>
     <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Эркин форма режиминде колдоону иштетүү үчүн өчүрүп-күйгүзүү керек."</string>
     <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Кошумча экрандарда иш такта режимин мажбурлап иштетүү үчүн өчүрүп-күйгүзүү керек."</string>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index a92bc24..4745c9d 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ບໍ່"</item>
-    <item msgid="5065465585332446709">"ຫຼັງຈາກ 1 ນາທີ"</item>
-    <item msgid="622807566366131941">"ຫຼັງຈາກ 5 ນາທີ"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 68fa477..aa18d5b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"ລົງທະບຽນແລ້ວ <xliff:g id="PERCENTAGE">%d</xliff:g> ເປີເຊັນ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ກຳລັງລົງທະບຽນລາຍນິ້ວມື <xliff:g id="PERCENTAGE">%d</xliff:g> ເປີເຊັນ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ເພີ່ມລາຍນິ້ວມືແລ້ວ"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ຕອນນີ້ທ່ານສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກແທັບເລັດຂອງທ່ານ ຫຼື ຢັ້ງຢືນວ່າແມ່ນທ່ານໄດ້ແລ້ວ, ເຊັ່ນ: ໃນເວລາທີ່ທ່ານເຂົ້າສູ່ລະບົບຫາແອັບ ຫຼື ອະນຸມັດການສັ່ງຊື້"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ຕອນນີ້ທ່ານສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກແທັບເລັດຂອງທ່ານ ຫຼື ຢັ້ງຢືນວ່າແມ່ນທ່ານໄດ້ແລ້ວ, ເຊັ່ນ: ໃນເວລາທີ່ທ່ານເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ຕອນນີ້ທ່ານສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ ຫຼື ຢັ້ງຢືນວ່າແມ່ນທ່ານໄດ້ແລ້ວ, ເຊັ່ນ: ໃນເວລາທີ່ທ່ານເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ຕອນນີ້ທ່ານສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ ຫຼື ຢັ້ງຢືນວ່າແມ່ນທ່ານໄດ້ແລ້ວ, ເຊັ່ນ: ໃນເວລາທີ່ທ່ານເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ປົດລັອກສະເພາະເມື່ອໜ້າຈໍເປີດຢູ່ເທົ່ານັ້ນ"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"ໜ້າຈໍຈະຕ້ອງເປີດຢູ່ທ່ານຈຶ່ງຈະສາມາດປົດລັອກດ້ວຍລາຍນິ້ວມືຂອງທ່ານໄດ້. ການດຳເນີນການນີ້ເຮັດໃຫ້ບໍ່ເກີດການປົດລັອກໂດຍບໍ່ຕັ້ງໃຈ."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ປົດລັອກໜ້າຈໍ"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ລາຍລະອຽດປະຫວັດການນຳໃຊ້"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ການໃຊ້ແບັດເຕີຣີ"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ເບິ່ງການນຳໃຊ້ໃນຮອບ 24 ຊົ່ວໂມງທີ່ຜ່ານມາ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ເບິ່ງການນຳໃຊ້ນັບຈາກການສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"ເບິ່ງການນຳໃຊ້ຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ການໃຊ້ແບັດເຕີຣີຂອງແອັບ"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ໃຊ້ລາຍລະອຽດ"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ປັບແຕ່ງການໃຊ້ພະລັງງານ"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ການໃຊ້ແບັດເຕີຣີ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ນັບຈາກສາກເຕັມ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ຈັດການການນຳໃຊ້ແບັດເຕີຣີ"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ຮວມ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ພື້ນຫຼັງ\nຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"ນຳໃຊ້ຮວມ <xliff:g id="TIME_0">^1</xliff:g> • ນຳໃຊ້ໃນພື້ນຫຼັງ <xliff:g id="TIME_1">^2</xliff:g>\nຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ຮວມ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ພື້ນຫຼັງ\nໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"ຮວມ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ພື້ນຫຼັງ\nສຳລັບ <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"ຮວມໜ້ອຍກວ່າໜຶ່ງນາທີຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"ນຳໃຊ້ຮວມບໍ່ຮອດ 1 ນາທີຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ຮວມໜ້ອຍກວ່າໜຶ່ງນາທີໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"ຮວມໜ້ອຍກວ່າໜຶ່ງນາທີສຳລັບ <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ພື້ນຫຼັງໜ້ອຍກວ່າໜຶ່ງນາທີຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ນຳໃຊ້ໃນພື້ນຫຼັງບໍ່ຮອດ 1 ນາທີຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ພື້ນຫຼັງໜ້ອຍກວ່າໜຶ່ງນາທີໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"ພື້ນຫຼັງໜ້ອຍກວ່າໜຶ່ງນາທີສຳລັບ <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"ຮວມ <xliff:g id="TIME">^1</xliff:g> ຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"ນຳໃຊ້ຮວມ <xliff:g id="TIME">^1</xliff:g> ຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ຮວມ <xliff:g id="TIME">^1</xliff:g> ໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> ຮວມສຳລັບ <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> ພື້ນຫຼັງຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"ນຳໃຊ້ໃນພື້ນຫຼັງ <xliff:g id="TIME">^1</xliff:g> ຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> ພື້ນຫຼັງໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> ພື້ນຫຼັງສຳລັບ <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ຮວມ <xliff:g id="TIME">^1</xliff:g> • ພື້ນຫຼັງໜ້ອຍກວ່າໜຶ່ງນາທີ\nຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"ນຳໃຊ້ຮວມ <xliff:g id="TIME">^1</xliff:g> • ນຳໃຊ້ໃນພື້ນຫຼັງບໍ່ຮອດ 1 ນາທີ\nຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ຮວມ <xliff:g id="TIME">^1</xliff:g> • ພື້ນຫຼັງໜ້ອຍກວ່າໜຶ່ງນາທີ\nໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"ຮວມ <xliff:g id="TIME_0">^1</xliff:g> • ພື້ນຫຼັງໜ້ອຍກວ່າໜຶ່ງນາທີ\nສຳລັບ <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ບໍ່ມີການນຳໃຊ້ຫຼັງຈາກສາກເຕັມຫຼ້າສຸດ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"ບໍ່ມີການນຳໃຊ້ຕັ້ງແຕ່ສາກຈົນເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ບໍ່ມີການນຳໃຊ້ໃນຮອບ 24 ຊມ ທີ່ຜ່ານມາ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ຜູ້ໃຊ້ອື່ນໆ"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ລຶບ <xliff:g id="USER_NAME">%1$s</xliff:g> ອອກຈາກອຸປະກອນນີ້"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ການ​ຕັ້ງ​ຄ່າ​ຫນ້າ​ຈໍລັອກ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ເພີ່ມຜູ້ໃຊ້ຈາກໜ້າຈໍລັອກ"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ສະຫຼັບໄປໃຊ້ຜູ້ໃຊ້ຜູ້ເບິ່ງແຍງເມື່ອວາງໃສ່ດັອກ"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ລຶບໂຕທ່ານເອງ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ລຶບຜູ້ໃຊ້ນີ້ອອກບໍ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ລຶບ​ໂປຣ​ໄຟລ໌​ນີ້​ບໍ?"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 046508f..efaa519 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Niekada"</item>
-    <item msgid="5065465585332446709">"Po 1 minutės"</item>
-    <item msgid="622807566366131941">"Po 5 minučių"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c042e62..d84fb0c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Jūsų veido modelis bus visam laikui saugiai ištrintas.\n\nIštrynus reikės PIN kodo, atrakinimo piešinio arba slaptažodžio, norint atrakinti telefoną."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Naudokite atrakinimo pagal veidą funkciją, kad atrakintumėte telefoną"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Kontr. kodo jutiklis"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Naudojant atrakinimą piršto atspaudu"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Kontrol. kodas darbui"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Kontrolin. kodų tvark."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Kontrolinių kodų naud."</string>
@@ -597,16 +596,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Užregistruota <xliff:g id="PERCENTAGE">%d</xliff:g> proc."</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registracija kontroliniu kodu: <xliff:g id="PERCENTAGE">%d</xliff:g> proc."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Kontrolinis kodas pridėtas"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Dabar galite naudoti kontrolinį kodą, kad atrakintumėte planšetinį kompiuterį ar patvirtintumėte savo tapatybę, pvz., kai prisijungiate prie programų ar patvirtinate pirkinį"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Dabar galite naudoti kontrolinį kodą, kad atrakintumėte planšetinį kompiuterį ar patvirtintumėte savo tapatybę, pvz., kai prisijungiate prie programų"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Dabar galite naudoti kontrolinį kodą, kad atrakintumėte įrenginį ar patvirtintumėte savo tapatybę, pvz., kai prisijungiate prie programų"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Dabar galite naudoti kontrolinį kodą, kad atrakintumėte telefoną ar patvirtintumėte savo tapatybę, pvz., kai prisijungiate prie programų"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Atrakinti tik tada, kai ekranas įjungtas"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ekranas turi būti įjungtas, kad būtų galima atrakinti piršto atspaudu. Tai sumažina netyčinio atrakinimo tikimybę."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekranas, atrakinti"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Atlikti vėliau"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Patraukite ir vėl prilieskite"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Padėkite vieną piršto šoną ant jutiklio ir palaikykite, tada tą patį atlikite su kitu šonu"</string>
@@ -1563,8 +1561,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Nepasiekiama dėl įjungto laiko eiti miegoti režimo"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Ekrano užsklandos naudojimas"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Įkraunat ar prijungus prie doko"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Kai prijungta prie doko ir kraunama"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Įkraunant"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Kai yra doke"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Niekada"</string>
@@ -2876,7 +2873,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Istorijos informacija"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Akumuliatoriaus energijos vartojimas"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Naudojimo per pastar. 24 val. peržiūra"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Naud. nuo pask. visiško įkr. peržiūra"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Žr. akum. lygį nuo paskutinio įkrovimo"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Programos akumuliatoriaus energijos vartojimas"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Išsami naudojimo informacija"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Reguliuoti maitinimo naudojimą"</string>
@@ -3071,25 +3068,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Akumuliatoriaus energijos vartojimas"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Nuo visiško įkrovimo"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Tvarkyti akumuliatoriaus naudojimą"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Iš viso <xliff:g id="TIME_0">^1</xliff:g> • Naudota fone <xliff:g id="TIME_1">^2</xliff:g>\nnuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> iš viso • <xliff:g id="TIME_1">^2</xliff:g> naudota fone\nnuo paskutinio visiško įkrovimo"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Iš viso <xliff:g id="TIME_0">^1</xliff:g> • Naudota fone <xliff:g id="TIME_1">^2</xliff:g>\nper pastarąsias 24 val."</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Iš viso <xliff:g id="TIME_0">^1</xliff:g> • Naudota fone <xliff:g id="TIME_1">^2</xliff:g>\nper<xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Iš viso naudota mažiau nei minutę nuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Iš viso naudota mažiau nei minutę nuo paskutinio visiško įkrovimo"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Iš viso mažiau nei minutę per pastarąsias 24 val."</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Iš viso mažiau nei minutę per <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Naudota fone mažiau nei minutę nuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Naudota fone mažiau nei minutę nuo paskutinio visiško įkrovimo"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Naudota fone mažiau nei minutę per pastarąsias 24 val."</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Naudota fone mažiau nei minutę per <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Iš viso <xliff:g id="TIME">^1</xliff:g> nuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> iš viso nuo paskutinio visiško įkrovimo"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Iš viso <xliff:g id="TIME">^1</xliff:g> per pastarąsias 24 val."</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Iš viso <xliff:g id="TIME_0">^1</xliff:g> per <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Naudota fone <xliff:g id="TIME">^1</xliff:g> nuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> naudota fone nuo paskutinio visiško įkrovimo"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Naudota fone <xliff:g id="TIME">^1</xliff:g> per pastarąsias 24 val."</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"Naudota fone <xliff:g id="TIME_0">^1</xliff:g> per <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Iš viso <xliff:g id="TIME">^1</xliff:g> • Naudota fone mažiau nei minutę\nnuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> iš viso • naudota fone mažiau nei minutę\nnuo paskutinio visiško įkrovimo"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Iš viso <xliff:g id="TIME">^1</xliff:g> • Naudota fone mažiau nei minutę\nper pastarąsias 24 val."</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Iš viso <xliff:g id="TIME_0">^1</xliff:g> • Naudota fone mažiau nei minutę\nper <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nenaudota nuo pastarojo visiško įkrovimo"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nenaudota nuo paskutinio visiško įkrovimo"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nenaudota per pastarąsias 24 val."</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Kiti naudotojai"</string>
@@ -3577,7 +3574,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Ištrinti <xliff:g id="USER_NAME">%1$s</xliff:g> iš šio įr."</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Užrakinimo ekrano nustatymai"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Pridėti naudotojų iš užrakinimo ekrano"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Perjungti į naud. administr., kai prij. prie doko"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Ištrinti save?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ištrinti šį naudotoją?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Pašalinti šį profilį?"</string>
@@ -4302,8 +4300,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"„Android“ jūsų prašymu blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"„Android“ jūsų prašymu blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"„Android“ jūsų prašymu blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Ši programa nesiunčia pranešimų"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorijos"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Kita"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 221574d..c5ffcd3 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nekad"</item>
-    <item msgid="5065465585332446709">"Pēc 1 minūtes"</item>
-    <item msgid="622807566366131941">"Pēc 5 minūtēm"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c10af6e..25dff6a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -456,8 +456,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Jūsu sejas modelis tiks neatgriezeniski un droši izdzēsts.\n\nPēc tā dzēšanas jums būs jāizmanto PIN, kombinācija vai parole, lai atbloķētu savu tālruni."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Izmantot tālruņa atbloķēšanai autorizāciju pēc sejas"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Pirkstu nospiedumi"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Autorizācijas ar pirksta nospiedumu izmantošana"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Pirksta nospiedums darbam"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Nospiedumu pārvaldība"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Nospieduma lietošana"</string>
@@ -593,16 +592,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Reģistrēšanas progresa procenti: <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Pirksta nospieduma reģistrēšana: <xliff:g id="PERCENTAGE">%d</xliff:g> procenti"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Pirksta nospiedums pievienots"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Tagad varat izmantot pirksta nospiedumu, lai atbloķētu planšetdatoru vai apstiprinātu savu identitāti, piemēram, pierakstoties lietotnēs vai apstiprinot pirkumu."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Tagad varat izmantot pirksta nospiedumu, lai atbloķētu planšetdatoru vai apstiprinātu savu identitāti, piemēram, pierakstoties lietotnēs."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Tagad varat izmantot pirksta nospiedumu, lai atbloķētu ierīci vai apstiprinātu savu identitāti, piemēram, pierakstoties lietotnēs."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Tagad varat izmantot pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu savu identitāti, piemēram, pierakstoties lietotnēs."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Atbloķēt tikai tad, kad ekrāns ir aktivizēts"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ekrānam ir jābūt aktivizētam, lai varētu to atbloķēt, izmantojot pirksta nospiedumu. Tādējādi tiek samazināta nejaušas atbloķēšanas iespējamība."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekrāns, atbloķēšana"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Vēlāk"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Paceliet un vēlreiz pieskarieties"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Novietojiet pirksta sānu uz sensora un turiet, bet pēc tam novietojiet otru pirksta sānu"</string>
@@ -1543,8 +1541,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Nav pieejams, jo ir ieslēgts naktsmiera režīms"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Izmantot ekrānsaudzētāju"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Uzlādes vai dokošanas laikā"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Kad ierīce dokota un notiek uzlāde"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Uzlādes laikā"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Kamēr tiek dokots"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nekad"</string>
@@ -2845,7 +2842,8 @@
     <string name="history_details_title" msgid="8628584613889559355">"Vēstures dati"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Akumulatora lietojums"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Skatīt lietojumu pēdējo 24 stundu laikā"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Skatīt lietojumu kopš pēdējās pilnās uzlādes"</string>
+    <!-- no translation found for advanced_battery_preference_summary (2372763700477268393) -->
+    <skip />
     <string name="battery_details_title" msgid="3289680399291090588">"Akumulatora lietojums lietotnēm"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Izmantot detaļas"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Noregulēt strāvas patēriņu"</string>
@@ -3033,25 +3031,32 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Akumulatora lietojums"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Kopš pilnas uzlādes"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Akumulatora lietojuma pārvaldīšana"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Kopā: <xliff:g id="TIME_0">^1</xliff:g> • Lietojums fonā: <xliff:g id="TIME_1">^2</xliff:g>\n(kopš pēdējās pilnās uzlādes)"</string>
+    <!-- no translation found for battery_total_and_bg_usage (8435738393326063685) -->
+    <skip />
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Kopā: <xliff:g id="TIME_0">^1</xliff:g> • Lietojums fonā: <xliff:g id="TIME_1">^2</xliff:g>\n(pēdējo 24 h laikā)"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Kopā: <xliff:g id="TIME_0">^1</xliff:g> • Lietojums fonā: <xliff:g id="TIME_1">^2</xliff:g>\n(šajā periodā: <xliff:g id="TIME_PERIOD">^3</xliff:g>)"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Mazāk nekā minūti ilgs kopējais lietojums kopš pēdējās pilnās uzlādes"</string>
+    <!-- no translation found for battery_total_usage_less_minute (3199193389086828320) -->
+    <skip />
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Mazāk nekā minūti ilgs kopējais lietojums pēdējo 24 h laikā"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Mazāk nekā minūti ilgs kopējais lietojums šajā periodā: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Mazāk nekā minūti ilgs lietojums fonā kopš pēdējās pilnās uzlādes"</string>
+    <!-- no translation found for battery_bg_usage_less_minute (7776884932074493406) -->
+    <skip />
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Mazāk nekā minūti ilgs lietojums fonā pēdējo 24 h laikā"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Mazāk nekā minūti ilgs lietojums fonā šajā periodā: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Kopā: <xliff:g id="TIME">^1</xliff:g> (kopš pēdējās pilnās uzlādes)"</string>
+    <!-- no translation found for battery_total_usage (4811532932663354619) -->
+    <skip />
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Kopā: <xliff:g id="TIME">^1</xliff:g> (pēdējo 24 h laikā)"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> ilgs kopējais lietojums šajā periodā: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Lietojums fonā kopš pēdējās pilnās uzlādes: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_bg_usage (8262917746299259350) -->
+    <skip />
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Lietojums fonā pēdējo 24 h laikā: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"Lietojums fonā: <xliff:g id="TIME_0">^1</xliff:g> (šajā periodā: <xliff:g id="TIME_PERIOD">^2</xliff:g>)"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Kopā: <xliff:g id="TIME">^1</xliff:g> • Mazāk nekā minūti ilgs lietojums fonā\nkopš pēdējās pilnās uzlādes"</string>
+    <!-- no translation found for battery_total_usage_and_bg_less_minute_usage (3861884807364163833) -->
+    <skip />
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Kopā: <xliff:g id="TIME">^1</xliff:g> • Mazāk nekā minūti ilgs lietojums fonā\npēdējo 24 h laikā"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Kopā: <xliff:g id="TIME_0">^1</xliff:g> • Mazāk nekā minūti ilgs lietojums fonā\n(šajā periodā: <xliff:g id="TIME_PERIOD">^2</xliff:g>)"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nav lietots kopš pēdējās pilnās uzlādes"</string>
+    <!-- no translation found for battery_not_usage (3851536644733662392) -->
+    <skip />
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nav lietots pēdējo 24 h laikā"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Citi lietotāji"</string>
@@ -3535,7 +3540,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Dzēst šajā ierīcē: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Bloķēšanas ekrāna iestatījumi"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Pievienot lietotājus no bloķēšanas ekrāna"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Dokojot pārslēgt lietotāju ar administratora tiesībām"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Vai dzēst jūsu kontu?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Vai dzēst šo lietotāju?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Vai noņemt šo profilu?"</string>
@@ -4254,8 +4260,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Pēc jūsu pieprasījuma Android neatļauj šīs lietotnes paziņojumu rādīšanu šajā ierīcē."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Pēc jūsu pieprasījuma Android neatļauj šīs kategorijas paziņojumu rādīšanu šajā ierīcē."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Pēc jūsu pieprasījuma Android neatļauj šīs grupas paziņojumu rādīšanu šajā ierīcē."</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"No šīs lietotnes netiek sūtīti paziņojumi"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorijas"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Cits"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 3f8ca85..af5aaf4 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Никогаш"</item>
-    <item msgid="5065465585332446709">"По 1 минута"</item>
-    <item msgid="622807566366131941">"По 5 минути"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ab63c00..d9aa83a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -592,10 +592,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечатокот е додаден"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Сега може да го користите отпечатокот за да го отклучите таблетот или да потврдите дека сте вие, како кога се најавувате на апликации или одобрувате купување"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Сега може да го користите отпечатокот за да го отклучите телефонот или да потврдите дека сте вие, како кога се најавувате на апликации"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Сега може да го користите отпечатокот за да го отклучите телефонот или да потврдите дека сте вие, како кога се најавувате на апликации"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Сега може да го користите отпечатокот за да го отклучите телефонот или да потврдите дека сте вие, како кога се најавувате на апликации"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Отклучете само кога екранот е вклучен"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Екранот мора да биде вклучен пред да може да го отклучите со отпечаток. Ова го прави случајното отклучување да биде помалку веројатно."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Екран, отклучување"</string>
@@ -2813,7 +2815,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Детали на историја"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Користење на батеријата"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Прикажи користење во минатите 24 часа"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Прикажи користење од последното целосно полнење"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Користење од последното целосно полнење"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Користење на батеријата за апликации"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Користи детали"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Приспособи употреба на струја"</string>
@@ -2994,25 +2996,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Користење на батеријата"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Искористеност по целосно полнење"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Управување со користењето на батеријата"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Вкупно: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> во заднина\nод последното целосно полнење"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Вкупно: <xliff:g id="TIME_0">^1</xliff:g> • Во заднина: <xliff:g id="TIME_1">^2</xliff:g>\nод последното целосно полнење"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Вкупно <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> во заднина\nво минатите 24 часа"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Вкупно <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> во заднина\nво периодот <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Вкупно: помалку од една минута од последното целосно полнење"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Вкупно: помалку од една минута од последното целосно полнење"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Вкупно: помалку од една минута во минатите 24 часа"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Вкупно: помалку од минута <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Во заднина помалку од една минута од последното целосно полнење"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Во заднина: помалку од една минута од последното целосно полнење"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Во заднина помалку од минута во минатите 24 часа"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Во заднина помалку од една минута во периодот <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Вкупно: <xliff:g id="TIME">^1</xliff:g> од последното целосно полнење"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Вкупно: <xliff:g id="TIME">^1</xliff:g> од последното целосно полнење"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Вкупно: <xliff:g id="TIME">^1</xliff:g> во минатите 24 часа"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Вкупно: <xliff:g id="TIME_0">^1</xliff:g>, <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> во заднина од последното целосно полнење"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Во заднина: <xliff:g id="TIME">^1</xliff:g> од последното целосно полнење"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> во заднина во минатите 24 часа"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> во заднина во периодот <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Вкупно: <xliff:g id="TIME">^1</xliff:g> • Во заднина помалку од една минута\nод последното целосно полнење"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Вкупно: <xliff:g id="TIME">^1</xliff:g> • Во заднина: помалку од една минута\nод последното целосно полнење"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Вкупно <xliff:g id="TIME">^1</xliff:g> • Во заднина помалку од една минута\nво минатите 24 часа"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Вкупно <xliff:g id="TIME_0">^1</xliff:g> • Во заднина помалку од една минута\nво периодот <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Не е користена од последното целосно полнење"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Нема користење од последното целосно полнење"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Не е користена во минатите 24 часа"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Други корисници"</string>
@@ -3492,7 +3494,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Избриши го <xliff:g id="USER_NAME">%1$s</xliff:g> од тука"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Поставки на екранот за заклучување"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Додавање корисници од заклучен екран"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Префрли се на корисник администратор кога уредот е приклучен на док"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Избриши се себеси?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Да се избрише корисникот?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Да се отстрани профилот?"</string>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index d130991..771c191 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ഒരിക്കലും വേണ്ട"</item>
-    <item msgid="5065465585332446709">"ഒരു മിനിറ്റിന് ശേഷം"</item>
-    <item msgid="622807566366131941">"5 മിനിറ്റിന് ശേഷം"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index bccf6df..3ec5d65 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"നിങ്ങളുടെ മുഖ മോഡൽ ശാശ്വതമായും സുരക്ഷിതമായും ഇല്ലാതാക്കും.\n\n ഇല്ലാതാക്കിയാൽ, ഫോൺ അൺലോക്ക് ചെയ്യാൻ പിൻ, പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‍വേഡ് വേണ്ടി വരും."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യാൻ ഫെയ്‌സ് അൺലോക്ക് ഉപയോഗിക്കുക"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ഫിംഗർപ്രിന്റ്"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ഫിംഗർപ്രിന്റ് അൺലോക്ക് ഉപയോഗിക്കുമ്പോൾ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ഔദ്യോഗിക ഫിംഗർപ്രിന്റ്"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"വിരലടയാളങ്ങൾ നിയന്ത്രിക്കുക"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ഇതിനായി ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> ശതമാനം എൻറോൾ ചെയ്തു"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ഫിംഗർപ്രിന്റ് എൻറോൾ ചെയ്യൽ <xliff:g id="PERCENTAGE">%d</xliff:g> ശതമാനം ആയി"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ഫിംഗർപ്രിന്റ് ചേർത്തു"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ടാബ്‌ലെറ്റ് അൺലോക്ക് ചെയ്യാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നത് പോലുള്ള സന്ദർഭങ്ങളിൽ ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കാനോ ഇപ്പോൾ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകും"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ടാബ്‌ലെറ്റ് അൺലോക്ക് ചെയ്യാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നത് പോലുള്ള സന്ദർഭങ്ങളിൽ ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കാനോ ഇപ്പോൾ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകും"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ഉപകരണം അൺലോക്ക് ചെയ്യാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നത് പോലുള്ള സന്ദർഭങ്ങളിൽ ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കാനോ ഇപ്പോൾ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകും"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യുന്നത് പോലുള്ള സന്ദർഭങ്ങളിൽ ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കാനോ ഇപ്പോൾ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാനാകും"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"സ്ക്രീൻ ഓണായിരിക്കുമ്പോൾ മാത്രം അൺലോക്ക് ചെയ്യുക"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യുന്നതിന് മുമ്പ് സ്ക്രീൻ ഓണായിരിക്കണം. ഇത്, അവിചാരിതമായി അൺലോക്ക് ചെയ്യുന്നതിനുള്ള സാധ്യത കുറയ്ക്കുന്നു."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"സ്ക്രീൻ അൺലോക്ക്"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ഇത് പിന്നീട് ചെയ്യുക"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"വിരലെടുക്കുക, വീണ്ടും സ്‌പർശിക്കുക"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റിന്റെ വശം സെൻസറിൽ വച്ച് അമർത്തിപ്പിടിക്കുക, തുടർന്ന് മറ്റേ വശം നൽകുക"</string>
@@ -2375,7 +2373,7 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ആവശ്യങ്ങൾക്ക് അനുസരിച്ച് നിങ്ങൾക്ക് ഈ ഉപകരണം ഇഷ്ടാനുസൃതമാക്കാം. ഈ ഉപയോഗസഹായി ഫീച്ചറുകൾ പിന്നീട് ക്രമീകരണത്തിൽ മാറ്റാവുന്നതാണ്."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ഫോണ്ട് വലുപ്പം മാറ്റുക"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"സ്‌ക്രീൻ റീഡർ"</string>
-    <string name="captions_category_title" msgid="574490148949400274">"അടിക്കുറിപ്പുകൾ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"സബ്ടൈറ്റിലുകൾ"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"ഓഡിയോ"</string>
     <string name="general_category_title" msgid="6298579528716834157">"പൊതുവായവ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ഡി‌സ്‌പ്ലേ"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ചരിത്ര വിശദാംശം"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ബാറ്ററി ഉപയോഗം"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"കഴിഞ്ഞ 24 മണിക്കൂറിലെ ഉപയോഗം കാണുക"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"അവസാനം ചാർജ് ചെയ്ത ശേഷമുള്ള ഉപയോഗം കാണുക"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"അവസാനം ചാർജ് ചെയ്ത ശേഷമുള്ള ഉപയോഗം കാണുക"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ആപ്പിന്റെ ബാറ്ററി ഉപയോഗം"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"വിശദാംശം ഉപയോഗിക്കൂ"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"പവർ ഉപയോഗം ക്രമീകരിക്കുക"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തത് മുതൽ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ബാറ്ററി ഉപയോഗം മാനേജ് ചെയ്യുക"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ആകെ ഉപയോഗം <xliff:g id="TIME_0">^1</xliff:g> • അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം\nപശ്ചാത്തല ഉപയോഗം <xliff:g id="TIME_1">^2</xliff:g>"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"ആകെ <xliff:g id="TIME_0">^1</xliff:g> • അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം \n<xliff:g id="TIME_1">^2</xliff:g> പശ്ചാത്തലത്തിൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ആകെ ഉപയോഗം <xliff:g id="TIME_0">^1</xliff:g> • കഴിഞ്ഞ 24 മണിക്കൂറിനിടെയുള്ള\nപശ്ചാത്തല ഉപയോഗം <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"ആകെ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> വരെയുള്ള\nപശ്ചാത്തല ഉപയോഗം <xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം ആകെ ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെ"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ഒരു മിനിറ്റിൽ താഴെ"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"കഴിഞ്ഞ 24 മണിക്കൂറിനിടെ ആകെ ഒരു മിനിറ്റിൽ താഴെ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> എന്നതിന് ഇടയിൽ ആകെ ഒരു മിനിറ്റിൽ താഴെ"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം പശ്ചാത്തല ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെ"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ഒരു മിനിറ്റിൽ താഴെ പശ്ചാത്തലത്തിൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"കഴിഞ്ഞ 24 മണിക്കൂറിനിടെയുള്ള പശ്ചാത്തല ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെ"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> എന്നതിന് ഇടയിൽ പശ്ചാത്തല ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെ"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം ആകെ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ആകെ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"കഴിഞ്ഞ 24 മണിക്കൂറിനിടെയുള്ള ആകെ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> എന്നതിന് ഇടയിൽ ആകെ <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം പശ്ചാത്തല ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം <xliff:g id="TIME">^1</xliff:g> പശ്ചാത്തലത്തിൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"കഴിഞ്ഞ 24 മണിക്കൂറിനിടെയുള്ള പശ്ചാത്തല ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> എന്നതിന് ഇടയിൽ പശ്ചാത്തല ഉപയോഗം <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ആകെ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g> • അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം\nപശ്ചാത്തല ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെ"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"ആകെ <xliff:g id="TIME">^1</xliff:g> • അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം\nഒരു മിനിറ്റിൽ താഴെ പശ്ചാത്തലത്തിൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ആകെ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g> • കഴിഞ്ഞ 24 മണിക്കൂറിനിടെയുള്ള\nപശ്ചാത്തല ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"ആകെ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> വരെയുള്ള\nപശ്ചാത്തല ഉപയോഗം ഒരു മിനിറ്റിൽ താഴെയാണ്"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"അവസാനം പൂർണ്ണമായി ചാർജ് ആയതിന് ശേഷം ഉപയോഗിച്ചിട്ടില്ല"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"അവസാനം പൂർണ്ണമായി ചാർജ് ചെയ്‌ത ശേഷം ഉപയോഗിച്ചിട്ടില്ല"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"കഴിഞ്ഞ 24 മണിക്കൂറിനിടെ ഉപയോഗിച്ചിട്ടില്ല"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"മറ്റ് ഉപയോക്താക്കൾ"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ഫോണിൽ നിന്നും <xliff:g id="USER_NAME">%1$s</xliff:g>-നെ മായ്ക്കൂ"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ലോക്ക് സ്ക്രീൻ ക്രമീകരണം"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ലോക്ക് സ്ക്രീനിൽ നിന്ന് ഉപയോക്താക്കളെ ചേർക്കുക"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ഡോക്ക് ചെയ്യുമ്പോൾ അഡ്‌മിൻ ഉപയോക്താവിലേക്ക് മാറുക"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"നിങ്ങളെ സ്വയം ഇല്ലാതാക്കണോ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ഈ ഉപയോക്താവിനെ ഇല്ലാതാക്കണോ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ഈ പ്രൊഫൈൽ നീക്കംചെയ്യണോ?"</string>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 7dff243..aed4998 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Огт үгүй"</item>
-    <item msgid="5065465585332446709">"1 минутын дараа"</item>
-    <item msgid="622807566366131941">"5 минутын дараа"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 3bef1e6..165245c 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Таны нүүрний загварыг аюулгүйгээр бүрмөсөн устгана.\n\nУстгасны дараа та утасныхаа түгжээг тайлахын тулд ПИН, хээ эсвэл нууц үгээ оруулах шаардлагатай болно."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Утасныхаа түгжээг тайлахын тулд Царайгаар түгжээ тайлахыг ашиглана уу"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Хурууны хээ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Хурууны хээгээр түгжээг тайлах үед"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Ажлын зориулалтаар ашиглах хурууны хээ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Хурууны хээ удирдах"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Хурууны хээг дараах зорилгоор ашиглах"</string>
@@ -589,16 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Бүртгүүлсэн <xliff:g id="PERCENTAGE">%d</xliff:g> хувь"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Хурууны хээ бүртгүүлэх явц <xliff:g id="PERCENTAGE">%d</xliff:g> хувь"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Хурууны хээ нэмсэн"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Одоо та хурууны хээгээ таблетынхаа түгжээг тайлах эсвэл аппуудад нэвтрэх, худалдан авалт зөвшөөрөх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Одоо та хурууны хээгээ таблетынхаа түгжээг тайлах эсвэл аппуудад нэвтрэх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Одоо та хурууны хээгээ төхөөрөмжийнхөө түгжээг тайлах эсвэл аппуудад нэвтрэх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Одоо та хурууны хээгээ утасныхаа түгжээг тайлах эсвэл аппуудад нэвтрэх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="6064618417107305796">"Одоо та хурууны хээгээ таблетынхаа түгжээг тайлах эсвэл аппуудад нэвтрэх, худалдан авалт зөвшөөрөх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="1948980056333872057">"Одоо та хурууны хээгээ төхөөрөмжийнхөө түгжээг тайлах эсвэл аппуудад нэвтрэх, худалдан авалт зөвшөөрөх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="3084541878035403475">"Одоо та хурууны хээгээ утасныхаа түгжээг тайлах эсвэл аппуудад нэвтрэх, худалдан авалт зөвшөөрөх зэргээр өөрийгөө мөн болохыг баталгаажуулахын тулд ашиглах боломжтой"</string>
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Зөвхөн дэлгэц асаалттай үед түгжээг тайлах"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Хурууны хээгээрээ түгжээг тайлахаас өмнө дэлгэц асаалттай байх ёстой. Энэ нь санамсаргүйгээр түгжээг тайлах магадлалыг бууруулдаг."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Дэлгэц, Түгжээг тайлах"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Дараа хийх"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Хөндийрүүлээд, дахин хүрнэ үү"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Хурууныхаа хээний хажуу талыг мэдрэгч дээр удаан байрлуулж, дараа нь нөгөө тал руу сэлгэнэ үү"</string>
@@ -2813,7 +2808,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Түүхийн мэдээлэл"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Батарей ашиглалт"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Өнгөрсөн 24 цагийн ашиглалтыг харах"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Сүүлийн бүрэн цэнэглэлтээс ашиглалтыг харах"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтыг харах"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Аппын батарейны ашиглалт"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Ашиглалтын мэдээлэл"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Цэнэг ашиглалтыг тохируулах"</string>
@@ -2994,25 +2989,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Батарей ашиглалт"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Бүрэн цэнэглэснээс хойш"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Батарей ашиглалтыг удирдах"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Нийт <xliff:g id="TIME_0">^1</xliff:g> • сүүлд бүрэн цэнэглэснээс хойш\nдэвсгэрт <xliff:g id="TIME_1">^2</xliff:g> ашигласан"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Нийт <xliff:g id="TIME_0">^1</xliff:g> • сүүлд бүрэн цэнэглэснээс хойш дэвсгэрт <xliff:g id="TIME_1">^2</xliff:g>\nашигласан"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Нийт <xliff:g id="TIME_0">^1</xliff:g> • өнгөрсөн 24 цагийн\nтурш дэвсгэрт <xliff:g id="TIME_1">^2</xliff:g> ашигласан"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Нийт <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g>-н\nтурш дэвсгэрт <xliff:g id="TIME_1">^2</xliff:g> ашигласан"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Сүүлд бүрэн цэнэглэснээс хойш нийт 1 минутаас бага хугацаанд ашигласан"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Сүүлд бүрэн цэнэглэснээс хойш нийт 1 минутаас бага хугацаанд ашигласан"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Өнгөрсөн 24 цагийн турш нийт 1 минутаас бага хугацаанд ашигласан"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g>-н турш нийт нэг минутаас бага хугацаанд ашигласан"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Сүүлд бүрэн цэнэглэснээс хойш дэвсгэрт 1 минутаас бага хугацаанд ашигласан"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Сүүлд бүрэн цэнэглэснээс хойш дэвсгэрт 1 минутаас бага хугацаанд ашигласан"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Өнгөрсөн 24 цагийн турш дэвсгэрт 1 минутаас бага хугацаанд ашигласан"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g>-н турш дэвсгэрт нэг минутаас бага хугацаанд ашигласан"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Сүүлд бүрэн цэнэглэснээс хойш нийт <xliff:g id="TIME">^1</xliff:g> ашигласан"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Сүүлд бүрэн цэнэглэснээс хойш нийт <xliff:g id="TIME">^1</xliff:g> ашигласан"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Өнгөрсөн 24 цагийн турш нийт <xliff:g id="TIME">^1</xliff:g> ашигласан"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>-н турш нийт <xliff:g id="TIME_0">^1</xliff:g> ашигласан"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Сүүлд бүрэн цэнэглэснээс хойш дэвсгэрт <xliff:g id="TIME">^1</xliff:g> ашигласан"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Сүүлд бүрэн цэнэглэснээс хойш дэвсгэрт <xliff:g id="TIME">^1</xliff:g> ашигласан"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Өнгөрсөн 24 цагийн турш дэвсгэрт <xliff:g id="TIME">^1</xliff:g> ашигласан"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g>-н турш дэвсгэрт <xliff:g id="TIME_0">^1</xliff:g> ашигласан"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Нийт <xliff:g id="TIME">^1</xliff:g> • сүүлд бүрэн цэнэглэснээс хойш\nдэвсгэрт 1 минутаас бага хугацаанд ашигласан"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Нийт <xliff:g id="TIME">^1</xliff:g> • сүүлд бүрэн цэнэглэснээс хойш дэвсгэрт 1 минутаас бага хугацаанд\nашигласан"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Нийт <xliff:g id="TIME">^1</xliff:g> • өнгөрсөн 24 цагийн\nтурш дэвсгэрт 1 минутаас бага хугацаанд ашигласан"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Нийт <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g>-н\nтурш дэвсгэрт нэг минутаас бага хугацаанд ашигласан"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Сүүлд бүрэн цэнэглэснээс хойш ашиглаагүй"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Сүүлд бүрэн цэнэглэснээс хойш ашиглаагүй"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Өнгөрсөн 24 цагийн турш ашиглаагүй"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Бусад хэрэглэгч"</string>
@@ -3492,7 +3487,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g>-г энэ төхөөрөмжөөс устгах"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Дэлгэц түгжих тохиргоо"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Түгжигдсэн дэлгэцээс хэрэглэгч нэмэх"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Суурилуулах үед админ хэрэглэгч рүү сэлгэх"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Өөрийгөө устгах уу?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Энэ хэрэглэгчийг устгах уу?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Энэ профайлыг устгах уу?"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 40cbe6f..0890f2e 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"कधीही नाही"</item>
-    <item msgid="5065465585332446709">"एका मिनिटानंतर"</item>
-    <item msgid="622807566366131941">"पाच मिनिटांनंतर"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e0a122c..5e41199 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"तुमचे फेस मॉडेल कायमचे आणि सुरक्षितरीत्या हटवले जाईल.\n\nहटवल्यानंतर, तुमचा फोन अनलॉक करण्यासाठी तुम्हाला तुमचा पिन, पॅटर्न किंवा पासवर्ड लागेल."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"तुमचा फोन अनलॉक करण्यासाठी फेस अनलॉक वापरा"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"फिंगरप्रिंट"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"फिंगरप्रिंट अनलॉक वापरत असताना"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ऑफिससाठी फिंगरप्रिंट"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"फिंगरप्रिंट व्यवस्‍थापित करा"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"फिंगरप्रिंट यासाठी वापरा"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> टक्के नोंदणी झाली आहे"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"फिंगरप्रिंटची <xliff:g id="PERCENTAGE">%d</xliff:g> टक्के नोंदणी झाली आहे"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फिंगरप्रिंट जोडली"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ॲप्समध्ये साइन इन करणे किंवा खरेदी मंजूर करणे यांसारख्या गोष्टी करताना तुमचा टॅबलेट अनलॉक करण्यासाठी किंवा ते तुम्हीच आहात याची पडताळणी करण्यासाठी, आता तुम्ही तुमची फिंगरप्रिंट वापरू शकता"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"तुम्ही ॲप्समध्ये साइन इन करता, तेव्हा तुमचा टॅबलेट अनलॉक करण्यासाठी किंवा ते तुम्हीच आहात याची पडताळणी करण्यासाठी तुम्ही आता तुमची फिंगरप्रिंट वापरू शकता"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"तुम्ही ॲप्समध्ये साइन इन करता, तेव्हा तुमचे डिव्हाइस अनलॉक करण्यासाठी किंवा ते तुम्हीच आहात याची पडताळणी करण्यासाठी तुम्ही आता तुमची फिंगरप्रिंट वापरू शकता"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"तुम्ही ॲप्समध्ये साइन इन करता, तेव्हा तुमचा फोन अनलॉक करण्यासाठी किंवा ते तुम्हीच आहात याची पडताळणी करण्यासाठी तुम्ही आता तुमची फिंगरप्रिंट वापरू शकता"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"फक्त स्क्रीन सुरू असताना अनलॉक करा"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"तुमची फिंगरप्रिंट वापरून तुम्ही अनलॉक करण्यापूर्वी स्क्रीन सुरू असणे आवश्यक आहे. हे चुकून अनलॉक होण्याची शक्यता कमी करते."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"स्क्रीन, अनलॉक करा"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"हे नंतर करा"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"उचला, त्यानंतर पुन्हा स्पर्श करा"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"तुमची फिंगरप्रिंट घ्यायची असलेली एक बाजू सेन्सरवर ठेवा आणि धरून ठेवा, त्यानंतर दुसऱ्या बाजूवर स्विच करा"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"इतिहास तपशील"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"बॅटरी वापर"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"मागील २४ तासांमधील वापर पहा"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"पूर्ण चार्ज झाल्यानंतरचा बॅटरी वापर पहा"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"शेवटची पूर्ण चार्ज केल्यानंतरचा वापर पहा"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"अ‍ॅप बॅटरी वापर"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"तपशील वापरा"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"पॉवर वापर समायोजित करा"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"बॅटरी वापर"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"पूर्ण चार्जपासून"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"बॅटरी वापर व्यवस्थापित करा"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"एकूण <xliff:g id="TIME_0">^1</xliff:g> • शेवटची पूर्ण चार्ज केल्यानंतर\nबॅटरीचा बॅकग्राउंडमध्ये <xliff:g id="TIME_1">^2</xliff:g> वापर केला गेला"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"बॅटरी एकूण <xliff:g id="TIME_0">^1</xliff:g> • शेवटची पूर्ण चार्ज केल्यानंतर\n बॅकग्राउंडमध्ये <xliff:g id="TIME_1">^2</xliff:g> वापरली गेली"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"एकूण <xliff:g id="TIME_0">^1</xliff:g> • मागील २४ तासांमध्ये\nबॅटरीचा बॅकग्राउंडमध्ये <xliff:g id="TIME_1">^2</xliff:g> वापर केला गेला"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"एकूण <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> या कालावधीमध्ये\nबॅटरीचा बॅकग्राउंडमध्ये <xliff:g id="TIME_1">^2</xliff:g> वेळ वापर केला गेला"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"शेवटची पूर्ण चार्ज केल्यानंतर बॅटरीचा एकूण एक मिनिटापेक्षा कमी वेळ वापर केला गेला"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"बॅटरी शेवटची पूर्ण चार्ज केल्यानंतर एकूण एक मिनिटापेक्षा कमी वेळा वापरली गेली"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"मागील २४ तासांमध्ये बॅटरीचा एकूण वापर एक मिनिटापेक्षा कमी वेळ केला गेला"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> या कालावधीत एकूण एक मिनिटापेक्षा बॅटरीचा वापर कमी झाला"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"शेवटची पूर्ण चार्ज केल्यानंतर बॅटरीचा बॅकग्राउंडमध्ये एक मिनिटापेक्षा कमी वेळ वापर केला गेला"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"बॅटरी शेवटची पूर्ण चार्ज केल्यानंतर बॅकग्राउंडमध्ये एक मिनिटापेक्षा कमी वेळ वापरली गेली"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"मागील २४ तासांमध्ये बॅटरीचा बॅकग्राउंडमध्ये एक मिनिटापेक्षा कमी वेळ वापर केला गेला"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> या कालावधीत बॅकग्राउंडमध्ये एक मिनिटापेक्षा बॅटरीचा वापर कमी झाला"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"शेवटची पूर्ण चार्ज केल्यानंतर बॅटरीचा एकूण <xliff:g id="TIME">^1</xliff:g> वापर केला गेला"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"बॅटरी शेवटची पूर्ण चार्ज केल्यानंतर एकूण <xliff:g id="TIME">^1</xliff:g> वापरली गेली"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"मागील २४ तासांमध्ये बॅटरीचा एकूण <xliff:g id="TIME">^1</xliff:g> वापर केला गेला"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> कालावधीमधील एकूण <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"शेवटची पूर्ण चार्ज केल्यानंतर बॅटरीचा बॅकग्राउंडमध्ये <xliff:g id="TIME">^1</xliff:g> वापर केला गेला"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"बॅटरी शेवटची पूर्ण चार्ज केल्यानंतर बॅकग्राउंडमध्ये <xliff:g id="TIME">^1</xliff:g> वापरली गेली"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"मागील २४ तासांमध्ये बॅटरीचा बॅकग्राउंडमध्ये <xliff:g id="TIME">^1</xliff:g> वापर केला गेला"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> या कालावधीत बॅकग्राउंडमध्ये <xliff:g id="TIME_0">^1</xliff:g> बॅटरीचा वापर झाला"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"एकूण <xliff:g id="TIME">^1</xliff:g> • शेवटची पूर्ण चार्ज केल्यानंतर\nबॅटरीचा बॅकग्राउंडमध्ये एक मिनिटापेक्षा कमी वेळ वापर केला गेला"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"बॅटरी एकूण <xliff:g id="TIME">^1</xliff:g> • शेवटची पूर्ण चार्ज केल्यानंतर\nएका मिनिटापेक्षा कमी वापरली गेली"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"एकूण <xliff:g id="TIME">^1</xliff:g> • मागील २४ तासांमध्ये\nबॅटरीचा बॅकग्राउंडमध्ये एक मिनिटापेक्षा कमी वेळ वापर केला गेला"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"एकूण <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> या कालावधीमध्ये\nबॅटरीचा बॅकग्राउंडमध्ये एक मिनिटापेक्षा कमी वेळ वापर केला गेला"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"शेवटची पूर्ण चार्ज केल्यानंतर बॅटरी वापरलेली नाही"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"बॅटरी शेवटची पूर्ण चार्ज केल्यानंतर वापरली गेली नाही"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"मागील २४ तासांमध्ये बॅटरी वापरलेली नाही"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"इतर वापरकर्ते"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"या डिव्हाइसवरुन <xliff:g id="USER_NAME">%1$s</xliff:g> हटवा"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"लॉक स्क्रीन सेटिंग्ज"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"लॉक स्‍क्रीनवरून वापरकर्ते जोडा"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"डॉक केले असेल तेव्हा ॲडमिन वापरकर्त्यावर स्विच करा"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"आपल्या स्वत:ला हटवायचे?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"हा वापरकर्ता हटवायचा का?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"हे प्रोफाईल काढायचे?"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 09c6cf5..c1be806 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Tidak sekali-kali"</item>
-    <item msgid="5065465585332446709">"Selepas 1 minit"</item>
-    <item msgid="622807566366131941">"Selepas 5 minit"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 19f5880..352580f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> peratus didaftarkan"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Mendaftarkan cap jari <xliff:g id="PERCENTAGE">%d</xliff:g> peratus"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Cap jari ditambahkan"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Kini anda boleh menggunakan cap jari anda untuk membuka kunci tablet atau mengesahkan identiti anda, misalnya ketika anda log masuk ke apl atau meluluskan pembelian"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Sekarang, anda boleh menggunakan cap jari anda untuk membuka kunci tablet anda atau mengesahkan identiti anda, seperti ketika anda log masuk ke apl"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Sekarang, anda boleh menggunakan cap jari anda untuk membuka kunci peranti anda atau mengesahkan identiti anda, seperti ketika anda log masuk ke apl"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Sekarang, anda boleh menggunakan cap jari anda untuk membuka kunci telefon anda atau mengesahkan identiti anda, seperti ketika anda log masuk ke apl"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Hanya buka kunci apabila skrin dihidupkan"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Skrin perlu dihidupkan sebelum anda boleh membuka kunci dengan cap jari anda. Tindakan ini dapat mengurangkan kemungkinan kunci terbuka secara tidak sengaja."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skrin, Buka Kunci"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Butiran sejarah"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Penggunaan bateri"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Lihat penggunaan untuk 24 jam yang lalu"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Lihat penggunaan dari cas penuh terakhir"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Lihat penggunaan sejak cas penuh"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Penggunaan bateri apl"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Butiran penggunaan"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Laraskan penggunaan kuasa"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Penggunaan bateri"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Sejak cas penuh"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Urus penggunaan bateri"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Sejumlah <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> latar\nsejak cas penuh terakhir"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Sejumlah <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> latar \nsejak cas penuh terakhir"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Sejumlah <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> latar\nuntuk 24 jam yang lalu"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Sejumlah <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> latar\nuntuk <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Jumlah kurang dari seminit sejak cas penuh yang lalu"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Sejumlah kurang daripada seminit sejak cas penuh terakhir"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Jumlah kurang dari seminit untuk tempoh 24 jam yang lalu"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Jumlah kurang dari seminit untuk <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Latar kurang daripada seminit sejak cas penuh terakhir"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Latar kurang daripada seminit sejak cas penuh terakhir"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Latar kurang daripada seminit untuk tempoh 24 jam yang lalu"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Latar kurang daripada seminit untuk tempoh <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Sejumlah <xliff:g id="TIME">^1</xliff:g> sejak cas penuh yang lalu"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Sejumlah <xliff:g id="TIME">^1</xliff:g> sejak cas penuh terakhir"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Selama <xliff:g id="TIME">^1</xliff:g> untuk tempoh 24 jam yang lalu"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Sejumlah <xliff:g id="TIME_0">^1</xliff:g> untuk <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> latar sejak cas penuh terakhir"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> latar sejak cas penuh terakhir"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> latar untuk tempoh 24 jam yang lalu"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> latar untuk <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Selama <xliff:g id="TIME">^1</xliff:g> • latar kurang daripada seminit\nsejak cas penuh yang lalu"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Sejumlah <xliff:g id="TIME">^1</xliff:g> • latar kurang daripada seminit\nsejak cas penuh terakhir"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Selama <xliff:g id="TIME">^1</xliff:g> • latar kurang daripada seminit\nuntuk tempoh 24 jam yang lalu"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Selama <xliff:g id="TIME_0">^1</xliff:g> • latar kurang daripada seminit\nuntuk tempoh <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Tiada penggunaan sejak cas penuh terakhir"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Tiada penggunaan sejak cas penuh terakhir"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Tiada penggunaan untuk tempoh 24 jam yang lalu"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Pengguna lain"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Padam <xliff:g id="USER_NAME">%1$s</xliff:g> dari peranti"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Tetapan skrin kunci"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Tambahkan pengguna daripada skrin kunci"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Tukar kepada pengguna pentadbir apabila didok"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Padam diri anda sendiri?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Padamkan pengguna ini?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Alih keluar profil ini?"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index af9822b..ea117d5 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ဘယ်တော့မှ"</item>
-    <item msgid="5065465585332446709">"၁ မိနစ်နောက်ပိုင်း"</item>
-    <item msgid="622807566366131941">"၅ မိနစ်နောက်ပိုင်း"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 8a0fba1..dfa6d32 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"သင်၏မျက်နှာနမူနာကို လုံခြုံစွာ အပြီးဖျက်လိုက်ပါမည်။\n\nဖျက်ပြီးသည့်အခါ သင်၏ဖုန်းကိုဖွင့်ရန် လက်ဗွေ၊ ပင်နံပါတ်၊ ပုံစံ (သို့) စကားဝှက် လိုအပ်ပါမည်။"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း အသုံးပြုပါ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"လက်ဗွေ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ သုံးသောအခါ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"အလုပ်ပရိုဖိုင် လက်ဗွေ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"လက်ဗွေရာများ စီမံရန်"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"လက်ဗွေ သုံးရန်"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"စာရင်းသွင်းပြီး <xliff:g id="PERCENTAGE">%d</xliff:g> ရာခိုင်နှုန်း"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"လက်ဗွေ စာရင်းသွင်းခြင်း <xliff:g id="PERCENTAGE">%d</xliff:g> ရာခိုင်နှုန်း"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"လက်ဗွေကို ထည့်ပြီးပါပြီ"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"အက်ပ်များသို့ လက်မှတ်ထိုးဝင်သောအခါ (သို့) ပစ္စည်းဝယ်ယူသောအခါ သင်ဖြစ်ကြောင်းအတည်ပြုရန် (သို့) သင့်တက်ဘလက်ကိုဖွင့်ရန် သင့်လက်ဗွေကို ယခုသုံးနိုင်ပါပြီ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"အက်ပ်များသို့ လက်မှတ်ထိုးဝင်သောအခါကဲ့သို့ သင်ဖြစ်ကြောင်း အတည်ပြုရန်အတွက် (သို့) သင့်တက်ဘလက်ကို လော့ခ်ဖွင့်ရန်အတွက် သင့်လက်ဗွေကို ယခု သုံးနိုင်သည်"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"အက်ပ်များသို့ လက်မှတ်ထိုးဝင်သောအခါကဲ့သို့ သင်ဖြစ်ကြောင်း အတည်ပြုရန်အတွက် (သို့) သင့်စက်ကို လော့ခ်ဖွင့်ရန်အတွက် သင့်လက်ဗွေကို ယခု သုံးနိုင်သည်"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"အက်ပ်များသို့ လက်မှတ်ထိုးဝင်သောအခါကဲ့သို့ သင်ဖြစ်ကြောင်း အတည်ပြုရန်အတွက် (သို့) သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန်အတွက် သင့်လက်ဗွေကို ယခု သုံးနိုင်သည်"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ဖန်သားပြင်ဖွင့်ထားမှသာ လော့ခ်ဖွင့်ရန်"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"သင့်လက်ဗွေဖြင့် လော့ခ်မဖွင့်မီ ဖန်သားပြင်ကို ဖွင့်ထားရမည်။ ၎င်းက မတော်တဆ လော့ခ်ပွင့်ခြင်းကို လျော့နည်းစေမည်။"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ဖန်သားပြင်၊ လော့ခ်ဖွင့်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"နောက်မှလုပ်ရန်"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ဖယ်ပြီး ပြန်ထိပါ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"အာရုံခံကိရိယာပေါ်တွင် သင့်လက်ဗွေ၏ဘေးခြမ်းကို တင်ပြီးဖိထားပါ။ ထို့နောက် အခြားတစ်ဘက်သို့ ပြောင်းပါ"</string>
@@ -1518,10 +1516,10 @@
     <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"နောက်ခံကို အောက်ပါတို့မှရွေးချယ်ရန်"</string>
     <string name="style_suggestion_title" msgid="1213747484782364775">"သင့်ဖုန်းကို စိတ်ကြိုက်လုပ်ပါ"</string>
     <string name="style_suggestion_summary" msgid="4271131877800968159">"မတူသည့် ပုံစံများ၊ နောက်ခံများနှင့် အခြားအရာများကို စမ်းကြည့်ပါ"</string>
-    <string name="screensaver_settings_title" msgid="3588535639672365395">"ဖန်သားပြင်ချွေတာစနစ်"</string>
+    <string name="screensaver_settings_title" msgid="3588535639672365395">"စကရင်နားချိန်"</string>
     <string name="keywords_screensaver" msgid="7249337959432229172">"ဖန်သားပြင်နားချိန်"</string>
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"အိပ်ချိန်မုဒ်ကို ဖွင့်ထားသောကြောင့် မရရှိနိုင်ပါ"</string>
-    <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"ဖန်သားပြင်ချွေတာစနစ် သုံးခြင်း"</string>
+    <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"စကရင်နားချိန် သုံးခြင်း"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"အားသွင်းနေစဉ် သို့မဟုတ် တပ်ဆင်ထားစဉ်"</string>
     <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"တပ်ဆင်ပြီး အားသွင်းနေစဉ်"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"အားသွင်းနေစဉ်"</string>
@@ -1529,7 +1527,7 @@
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"ဘယ်တော့မှ"</string>
     <string name="screensaver_settings_summary_off" msgid="8720357504939106923">"ပိတ်"</string>
     <string name="screensaver_settings_when_to_dream" msgid="8145025742428940520">"စတင်ရန်အချိန်"</string>
-    <string name="screensaver_settings_current" msgid="390472865895976891">"လက်ရှိဖန်သားပြင်ချွေတာစနစ်"</string>
+    <string name="screensaver_settings_current" msgid="390472865895976891">"လက်ရှိ စခရင်နားချိန်ပုံ"</string>
     <string name="automatic_brightness" msgid="4599827881929079513">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"‘မ’ ယူ၍ နှိုးရန်"</string>
     <string name="ambient_display_screen_title" msgid="8615947016991429325">"ဝန်းကျင်ပြသမှု"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"မှတ်တမ်းအသေးစိတ်များ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ဘက်ထရီ အသုံးပြုမှု"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ပြီးခဲ့သော ၂၄ နာရီအတွင်း အသုံးပြုမှုကြည့်ရန်"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"နောက်ဆုံး အားအပြည့်သွင်းပြီးချိန်က အသုံးပြုမှုကို ပြသသည်"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"အားပြည့်သွင်းပြီးနောက်ပိုင်း အသုံးပြုမှုကြည့်ရန်"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"အက်ပ် ဘက်ထရီ အသုံးပြုမှု"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"အသေးစိတ် အသုံးပြုခြင်း"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ပါဝါအသုံးပြုမှုအား ချိန်တွယ်ခြင်း"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ဘက်ထရီ အသုံးပြုမှု"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"အားဖြည့်ပြီးချိန်ကတည်းက"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ဘက်ထရီအသုံးပြုမှုကို စီမံခန့်ခွဲရန်"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"စုစုပေါင်း <xliff:g id="TIME_0">^1</xliff:g> • နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက်\nနောက်ခံအချိန်က <xliff:g id="TIME_1">^2</xliff:g> ရှိသည်"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"စုစုပေါင်း <xliff:g id="TIME_0">^1</xliff:g> • နောက်ဆုံးအားအပြည့်သွင်းပြီး\nနောက်ခံအချိန် <xliff:g id="TIME_1">^2</xliff:g> ရှိသည်"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"စုစုပေါင်း <xliff:g id="TIME_0">^1</xliff:g> • ပြီးခဲ့သော ၂၄ နာရီအတွင်း\nနောက်ခံအချိန်က <xliff:g id="TIME_1">^2</xliff:g> ရှိသည်"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"စုစုပေါင်း <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> အတွက်\nနောက်ခံအချိန်က <xliff:g id="TIME_1">^2</xliff:g> ရှိသည်"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် စုစုပေါင်းက တစ်မိနစ်အောက် ရှိသည်"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"နောက်ဆုံးအားအပြည့်သွင်းပြီး စုစုပေါင်း တစ်မိနစ်အောက်ရှိသည်"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ပြီးခဲ့သော ၂၄ နာရီအတွင်း စုစုပေါင်း တစ်မိနစ်အောက် ရှိသည်"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> အတွက် စုစုပေါင်းက တစ်မိနစ်အောက် ရှိသည်"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် နောက်ခံအချိန်က တစ်မိနစ်အောက် ရှိသည်"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"နောက်ဆုံးအားအပြည့်သွင်းပြီး နောက်ခံအချိန် တစ်မိနစ်အောက်ရှိသည်"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ပြီးခဲ့သော ၂၄ နာရီအတွက် နောက်ခံအချိန်က တစ်မိနစ်အောက် ရှိသည်"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> အတွက် နောက်ခံအချိန်က တစ်မိနစ်အောက် ရှိသည်"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် စုစုပေါင်း <xliff:g id="TIME">^1</xliff:g> ရှိသည်"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"နောက်ဆုံးအားအပြည့်သွင်းပြီး စုစုပေါင်း <xliff:g id="TIME">^1</xliff:g> ရှိသည်"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ပြီးခဲ့သော ၂၄ နာရီအတွင်း စုစုပေါင်း <xliff:g id="TIME">^1</xliff:g> ရှိသည်"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> အတွက် စုစုပေါင်းက <xliff:g id="TIME_0">^1</xliff:g> ရှိသည်"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် နောက်ခံအချိန်က <xliff:g id="TIME">^1</xliff:g> ရှိသည်"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"နောက်ဆုံးအားအပြည့်သွင်းပြီး နောက်ခံအချိန် <xliff:g id="TIME">^1</xliff:g> ရှိသည်"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ပြီးခဲ့သော ၂၄ နာရီအတွင်း နောက်ခံအချိန်က <xliff:g id="TIME">^1</xliff:g> ရှိသည်"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> အတွက် နောက်ခံအချိန်က <xliff:g id="TIME_0">^1</xliff:g> ရှိသည်"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"စုစုပေါင်း <xliff:g id="TIME">^1</xliff:g> • နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက်\nနောက်ခံအချိန်က တစ်မိနစ်အောက် ရှိသည်"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"စုစုပေါင်း <xliff:g id="TIME">^1</xliff:g> • နောက်ဆုံးအားအပြည့်သွင်းပြီး နောက်ခံအချိန်\nတစ်မိနစ်အောက်ရှိသည်"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"စုစုပေါင်း <xliff:g id="TIME">^1</xliff:g> • ပြီးခဲ့သော ၂၄ နာရီအတွင်း\nနောက်ခံအချိန်က တစ်မိနစ်အောက် ရှိသည်"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"စုစုပေါင်း <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> အတွက်\nနောက်ခံအချိန်က တစ်မိနစ်အောက် ရှိသည်"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် အသုံးပြုမှု မရှိပါ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"နောက်ဆုံးအားအပြည့်သွင်းပြီး အသုံးပြုမှုမရှိပါ"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ပြီးခဲ့သော ၂၄ နာရီအတွင်း အသုံးပြုမှု မရှိပါ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"အခြားအသုံးပြုသူများ"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ဤစက်မှ <xliff:g id="USER_NAME">%1$s</xliff:g>ကို ဖျက်ရန်"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"လော့ခ်မျက်နှာပြင် ဆက်တင်များ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"လော့ခ်မျက်နှာပြင်မှနေ၍ အသုံးပြုသူများကို ထည့်ရန်"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"တပ်ဆင်ထားချိန်တွင် စီမံခန့်ခွဲသူသို့ ပြောင်းရန်"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"သင့်ကို ဖယ်ရှားမလား။"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ဤအသုံးပြုသူကို ဖျက်မလား။"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ဒီပရိုဖိုင်ကို ဖယ်ရှားရမလား?"</string>
@@ -5876,9 +5875,9 @@
   </string-array>
     <string name="tare_dialog_confirm_button_title" msgid="9179397559760203348">"အတည်ပြုရန်"</string>
     <string name="dream_preview_button_title" msgid="6637456541851795952">"အစမ်းကြည့်ရန်"</string>
-    <string name="dream_picker_category" msgid="7726447836872744867">"ဖန်သားပြင်ချွေတာစနစ် ရွေးရန်"</string>
+    <string name="dream_picker_category" msgid="7726447836872744867">"စကရင်နားချိန် ရွေးရန်"</string>
     <string name="dream_complications_toggle_title" msgid="4273232303027449163">"နောက်ထပ်အချက်အလက်များ ပြပါ"</string>
-    <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"ဖန်သားပြင်နားချိန်တွင် အချိန်၊ မိုးလေဝသ (သို့) အခြားအချက်အလက်များ ပြနိုင်သည်"</string>
+    <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"စကရင်နားချိန်ပုံတွင် အချိန်၊ မိုးလေဝသ (သို့) အခြားအချက်အလက်များ ပြနိုင်သည်"</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"နောက်ထပ်ဆက်တင်များ"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"သင်၏စခရင်နားချိန်ပုံ ရွေးရန်"</string>
     <string name="dream_setup_description" msgid="7508547154038580296">"တက်ဘလက် တပ်ဆင်ထားချိန် စခရင်တွင် မြင်ရမည့်အရာကို ရွေးနိုင်သည်။ စခရင်နားချိန်ပုံသုံးပါက သင်၏စက်က စွမ်းအင်ပိုသုံးနိုင်သည်။"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 2fa126d..62513c9 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Aldri"</item>
-    <item msgid="5065465585332446709">"Etter 1 minutt"</item>
-    <item msgid="622807566366131941">"Etter 5 minutter"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 74af8ae4..7587c39 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Ansiktsmodellen din blir slettet permanent og sikkert.\n\nEtter slettingen trenger du PIN-kode, mønster eller passord når du skal låse opp telefonen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Bruk ansiktslås til å låse opp telefonen"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingeravtrykk"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Ved bruk av opplåsing med fingeravtrykk"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingeravtrykk for jobb"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Admin. fingeravtrykk"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Bruk fingeravtrykk for"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Registrert <xliff:g id="PERCENTAGE">%d</xliff:g> prosent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Registrerer fingeravtrykket: <xliff:g id="PERCENTAGE">%d</xliff:g> prosent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeravtrykket er lagt til"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Nå kan du bruke fingeravtrykket til å låse opp nettbrettet eller bekrefte at det er deg, for eksempel når du logger på apper eller godkjenner kjøp"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Nå kan du bruke fingeravtrykket til å låse opp nettbrettet eller bekrefte at det er deg, for eksempel når du logger på apper"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Nå kan du bruke fingeravtrykket til å låse opp enheten eller bekrefte at det er deg, for eksempel når du logger på apper"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Nå kan du bruke fingeravtrykket til å låse opp telefonen eller bekrefte at det er deg, for eksempel når du logger på apper"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Lås bare opp enheten når skjermen er på"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Skjermen må være på før du kan låse opp enheten med fingeravtrykket. Dermed reduseres sannsynligheten for at enheten låses opp ved et uhell."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skjerm, opplåsing"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gjør det senere"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Løft fingeren og trykk igjen"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Plasser siden av fingeravtrykket på sensoren og hold. Bytt deretter til den andre siden."</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Utilgjengelig fordi sengetidsmodus er på"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Bruk skjermsparer"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Når enheten lades / er i dokken"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Når enheten er dokket og lader"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Når enheten lades"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Når enheten er i dokken"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Aldri"</string>
@@ -2696,7 +2693,7 @@
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Fordi en app skjuler tillatelsesforespørselen, kan ikke Innstillinger bekrefte svaret ditt."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> ber om full kontroll over denne enheten. Tjenesten kan lese skjermen og handle på vegne av brukere med tilgjengelighetsbehov. Dette kontrollnivået er ikke passende for de fleste apper."</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Full kontroll er passende for apper som hjelper deg med tilgjengelighetsbehov, men ikke for de fleste apper."</string>
-    <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Se og kontrollér skjermen"</string>
+    <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Se og kontroller skjermen"</string>
     <string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"Den kan lese alt innhold på skjermen og vise innhold over andre apper."</string>
     <string name="accessibility_service_action_perform_title" msgid="1449360056585337833">"Se og utfør handlinger"</string>
     <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"Den kan spore kommunikasjonen din med en app eller maskinvaresensor og kommunisere med apper på dine vegne."</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Loggdetaljer"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batteribruk"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Se bruk de siste 24 timene"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Se bruk siden siste fulle opplading"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Se bruk siden siste fullading"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Batteribruk for apper"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Bruksdetaljer"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Juster strømforbruk"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Batteribruk"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Siden sist batteriet var fulladet"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Styr batteribruk"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> totalt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunnen\nsiden sist batteriet var fulladet"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> totalt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunnen\nsiden siste fullading"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> totalt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunnen\nde siste 24 timene"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> totalt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunnen\ni perioden <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Totalt mindre enn ett minutt siden sist batteriet var fulladet"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Totalt under et minutt siden siste fullading"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Totalt mindre enn ett minutt de siste 24 timene"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Totalt mindre enn ett minutt <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Mindre enn ett minutt i bakgrunnen siden sist batteriet var fulladet"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Under et minutt i bakgrunnen siden siste fullading"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Mindre enn ett minutt i bakgrunnen de siste 24 timene"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Mindre enn ett minutt i bakgrunnen <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> totalt siden sist batteriet var fulladet"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> totalt siden siste fullading"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> totalt de siste 24 timene"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> i perioden <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> i bakgrunnen siden sist batteriet var fulladet"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> i bakgrunnen siden siste fullading"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> i bakgrunnen de siste 24 timene"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> i bakgrunnen <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> totalt • mindre enn ett minutt i bakgrunnen\nsiden sist batteriet var fulladet"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> totalt • under et minutt i bakgrunnen\nsiden siste fullading"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> totalt • mindre enn ett minutt i bakgrunnen\nde siste 24 timene"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> totalt • mindre enn et minutt i bakgrunnen\ni perioden <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Ingen bruk siden sist batteriet var fulladet"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Ingen bruk siden siste fullading"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Ingen bruk de siste 24 timene"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Andre brukere"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Slett <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enheten"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Innstillinger for låseskjermen"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Legg til brukere fra låseskjermen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Bytt til administratorbruker under dokking"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Vil du slette deg selv?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Vil du slette brukeren?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Fjerne denne profilen?"</string>
@@ -3963,7 +3961,7 @@
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Se alt fra de siste 7 dagene"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"Administrer"</string>
     <string name="app_notification_field" msgid="3858667320444612716">"Appinnstillinger"</string>
-    <string name="app_notification_field_summary" msgid="5981393613897713471">"Kontrollér varsler fra enkeltapper"</string>
+    <string name="app_notification_field_summary" msgid="5981393613897713471">"Kontroller varsler fra enkeltapper"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"Generelt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Jobbvarsler"</string>
     <string name="profile_section_header_for_advanced_privacy" msgid="8385775428904838579">"Jobbprofil"</string>
@@ -4120,7 +4118,7 @@
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Aldri"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Enhets- og appvarsler"</string>
-    <string name="manage_notification_access_summary" msgid="2907135226478903997">"Kontrollér hvilke apper og enheter som kan lese varsler"</string>
+    <string name="manage_notification_access_summary" msgid="2907135226478903997">"Kontroller hvilke apper og enheter som kan lese varsler"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Tilgang til varsler fra jobbprofilen er blokkert"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apper kan ikke lese varsler"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"I tråd med det du har valgt, hindrer Android at varsler fra denne appen vises på denne enheten"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"I tråd med det du har valgt, blokkerer Android denne varselkategorien fra å vises på denne enheten"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"I tråd med det du har valgt, blokkerer Android denne varselgruppen fra å vises på denne enheten"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Denne appen sender ikke varsler"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorier"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Annet"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -4520,7 +4517,7 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Ingen tillatelser er gitt"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Ingen tillatelser er forespurt"</string>
-    <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"Kontrollér apptilgang til dataene dine"</string>
+    <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"Kontroller apptilgang til dataene dine"</string>
     <string name="permissions_usage_title" msgid="2942741460679049132">"Personvernoversikt"</string>
     <string name="permissions_usage_summary" msgid="6784310472062516454">"Vis hvilke apper som nylig har brukt tillatelser"</string>
     <string name="unused_apps" msgid="4566272194756830656">"Ubrukte apper"</string>
@@ -4979,7 +4976,7 @@
     <string name="special_access_more" msgid="132919514147475846">"Se mer"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Tilbakestill kallgrense for ShortcutManager API"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"Frekvensberegning for ShortcutManager er tilbakestilt"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontrollér informasjon på låseskjermen"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Kontroller informasjon på låseskjermen"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Vis eller skjul varselinnhold"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"Alle"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Tips og brukerstøtte"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index c3ad659..aa844a3 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"कहिल्यै पनि होइन"</item>
-    <item msgid="5065465585332446709">"१ मिनेटपछि"</item>
-    <item msgid="622807566366131941">"५ मिनेटपछि"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 056c189..a24dc46 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"तपाईंको फेस मोडेल सुरक्षित रूपले सदाका लागि मेटिने छ।\n\nउक्त फेस मोडेल मेटिएपछि फोन अनलक गर्न तपाईंले आफ्नो PIN, प्याटर्न वा पासवर्ड प्रयोग गर्नु पर्ने हुन्छ।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"फोन अनलक गर्न फेस अनलक प्रयोग गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"फिंगरप्रिन्ट"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"फिंगरप्रिन्ट अनलक प्रयोग गर्दा"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"कार्य प्रोफाइलका लागि फिंगरप्रिन्ट"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"निम्नको लागि फिंगरप्रिन्ट प्रयोग गर्नुहोस्"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> प्रतिशत दर्ता गरिएको छ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"फिंगरप्रिन्ट दर्ता गर्ने कार्य <xliff:g id="PERCENTAGE">%d</xliff:g> पूरा भयो"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फिंगरप्रिन्ट हालियो"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"तपाईं अब ट्याब्लेट अनलक गर्न वा आफ्नो पहिचान पुष्टि गर्न (जस्तै, एपमा साइन इन गर्दा वा कुनै खरिद स्वीकृत गर्दा) आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"तपाईं अब ट्याब्लेट अनलक गर्न वा आफ्नो पहिचान पुष्टि गर्न (जस्तै, एपमा साइन इन गर्दा) आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"तपाईं अब डिभाइस अनलक गर्न वा आफ्नो पहिचान पुष्टि गर्न (जस्तै, एपमा साइन इन गर्दा) आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"तपाईं अब फोन अनलक गर्न वा आफ्नो पहिचान पुष्टि गर्न (जस्तै, एपमा साइन इन गर्दा) आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"स्क्रिन अन हुँदा मात्र अनलक गरियोस्"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"स्क्रिन अन भएपछि मात्र तपाईं आफ्नो फिंगरप्रिन्ट प्रयोग गरी अनलक गर्न सक्नुहुन्छ। यसमा गल्तीले अनलक हुने सम्भावना कम हुन्छ।"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"स्क्रिन, अनलक"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"यो काम पछि गर्नुहोस्‌"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"औँला उठाएर फेरि छुनुहोस्"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"आफ्नो कुनै औँलाको एकतिरको भाग सेन्सरमा राखिरहनुहोस् अनि उक्त औँलाको अर्को भाग पनि सेन्सरमा राखिरहनुहोस्"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"बेडटाइम मोड अन भएकाले यो सुविधा उपलब्ध छैन"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"स्क्रिन सेभर प्रयोग गरियोस्"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"चार्ज वा डक गरिरहँदा"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"डक तथा चार्ज गरिरहेका बेला"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"चार्ज गरिरहेका बेला"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"डक गरिएको बेला"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"कहिल्यै पनि होइन"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"इतिहास विवरणहरू"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ब्याट्रीको खपत"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"गत २४ घण्टाको ब्याट्री खपत हेर्नुहोस्"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"फुल चार्ज भएदेखिको ब्याट्रीको खपत हेर्नुहोस्"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"पछिल्लो पटक पूरा चार्ज भएपछि ब्याट्री कति प्रयोग भएको छ भन्ने हेर्नुहोस्"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"एपका हकमा तोकिएको ब्याट्रीको खपत"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"विवरणहरू प्रयोग गर्नुहोस्"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"उर्जा प्रयोग मिलाउनुहोस्"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ब्याट्रीको खपत"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"पूर्ण चार्ज भएदेखि"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ब्याट्रीको खपतको व्यवस्थापन गर्नुहोस्"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"कुल <xliff:g id="TIME_0">^1</xliff:g> • पछिल्लो पटक पूर्ण चार्ज भएदेखि <xliff:g id="TIME_1">^2</xliff:g> ब्याकग्राउन्डमा\nप्रयोग गरियो"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"पछिल्लो पटक पूरा चार्ज भएपछि कुल <xliff:g id="TIME_0">^1</xliff:g> प्रयोग भएकामा • ब्याकग्राउन्डमा <xliff:g id="TIME_1">^2</xliff:g>\nप्रयोग भएको छ"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"कुल <xliff:g id="TIME_0">^1</xliff:g> • पछिल्लो २४ घन्टामा <xliff:g id="TIME_1">^2</xliff:g> ब्याकग्राउन्डमा\nप्रयोग गरियो"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"कुल <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> मा <xliff:g id="TIME_1">^2</xliff:g> ब्याकग्राउन्डमा\nप्रयोग गरियो"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"पछिल्लो पटक पूर्ण चार्ज भएदेखि कुल एक मिनेटभन्दा कम समय प्रयोग गरियो"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"पछिल्लो पटक पूरा चार्ज भएपछि कुल एक मिनेटभन्दा कम समय प्रयोग भएको छ"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"पछिल्लो २४ घन्टामा कुल एक मिनेटभन्दा कम समय प्रयोग गरियो"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> को अन्तरालमा कुल एक मिनेटभन्दा कम समय प्रयोग गरियो"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"पछिल्लो पटक पूर्ण चार्ज भएदेखि एक मिनेटभन्दा कम समय ब्याकग्राउन्डमा प्रयोग गरियो"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"पछिल्लो पटक पूरा चार्ज भएपछि ब्याकग्राउन्डमा एक मिनेटभन्दा कम समय प्रयोग भएको छ"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"पछिल्लो २४ घन्टामा एक मिनेटभन्दा कम समय ब्याकग्राउन्डमा प्रयोग गरियो"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> को अन्तरालमा एक मिनेटभन्दा कम समय ब्याकग्राउन्डमा प्रयोग गरियो"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"पछिल्लो पटक पूर्ण चार्ज भएदेखि कुल <xliff:g id="TIME">^1</xliff:g> प्रयोग गरियो"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"पछिल्लो पटक पूरा चार्ज भएपछि कुल <xliff:g id="TIME">^1</xliff:g> प्रयोग भएको छ"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"पछिल्लो २४ घन्टामा कुल <xliff:g id="TIME">^1</xliff:g> प्रयोग गरियो"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> को अन्तरालमा कुल <xliff:g id="TIME_0">^1</xliff:g> प्रयोग गरियो"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"पछिल्लो पटक पूर्ण चार्ज भएदेखि <xliff:g id="TIME">^1</xliff:g> ब्याकग्राउन्डमा प्रयोग गरियो"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"पछिल्लो पटक पूरा चार्ज भएपछि ब्याकग्राउन्डमा <xliff:g id="TIME">^1</xliff:g> प्रयोग भएको छ"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"पछिल्लो २४ घन्टामा <xliff:g id="TIME">^1</xliff:g> ब्याकग्राउन्डमा प्रयोग गरियो"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> को अन्तरालमा <xliff:g id="TIME_0">^1</xliff:g> ब्याकग्राउन्डमा प्रयोग गरियो"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"कुल <xliff:g id="TIME">^1</xliff:g> • पछिल्लो पटक पूर्ण चार्ज भएदेखि एक मिनेटभन्दा कम समय\nब्याकग्राउन्डमा प्रयोग गरियो"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"पछिल्लो पटक पूरा चार्ज भएपछि कुल <xliff:g id="TIME">^1</xliff:g> प्रयोग भएकामा \n ब्याकग्राउन्डमा एक मिनेटभन्दा कम समय प्रयोग भएको छ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"कुल <xliff:g id="TIME">^1</xliff:g> • पछिल्लो २४ घन्टामा एक मिनेटभन्दा कम समय\nब्याकग्राउन्डमा प्रयोग गरियो"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"कुल <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> मा एक मिनेटभन्दा कम समय\nब्याकग्राउन्डमा प्रयोग गरियो"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"पछिल्लो पटक पूर्ण चार्ज भएदेखि ब्याट्री प्रयोग गरिएको छैन"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"पछिल्लो पटक पूरा चार्ज भएपछि कत्ति पनि प्रयोग भएको छैन"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"पछिल्लो २४ घन्टामा ब्याट्री प्रयोग गरिएन"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"अन्य प्रयोगकर्ताहरू"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"यस उपकरणबाट <xliff:g id="USER_NAME">%1$s</xliff:g> हटाउनुहोस्"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"लक स्क्रिन सेटिङहरू"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"लक स्क्रिनबाट प्रयोगकर्ताहरू थप्नुहोस्"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"डक गरिएका बेला एड्मिन खाता प्रयोग गर्नुहोस्"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"आफैंलाई हटाउने हो?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"यो प्रयोगकर्ता हटाउने हो?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"यो प्रोफाइल हटाउने?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"तपाईंको अनुरोधबमोजिम Android ले यस एपका सूचनाहरूलाई यो डिभाइसमा देखाउन दिइरहेको छैन"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो डिभाइसमा देखिन दिइरहेको छैन"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो डिभाइसमा देखाउन दिइरहेको छैन"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"यो एपले सूचना पठाउँदैन"</string>
     <string name="notification_channels" msgid="1502969522886493799">"कोटिहरू"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"अन्य"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d25be4c..e79a3e2 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nooit"</item>
-    <item msgid="5065465585332446709">"Na 1 minuut"</item>
-    <item msgid="622807566366131941">"Na 5 minuten"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0fecc33..b9ea92e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -347,7 +347,7 @@
     <string name="safety_center_summary" msgid="3554867379951053869">"App-beveiliging, apparaatvergrendeling, rechten"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gezicht toegevoegd"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Tik om ontgrendelen via gezicht in te stellen"</string>
-    <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Ontgrendelen via gezicht"</string>
+    <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Ontgrendelen via gezichtsherkenning"</string>
     <string name="security_settings_face_profile_preference_title" msgid="7519527436266375005">"Ontgrendelen via gezichtsherkenning voor werk"</string>
     <string name="security_settings_face_enroll_education_title" msgid="6448806884597691208">"Ontgrendelen via gezichtsherkenning instellen"</string>
     <string name="security_settings_face_enroll_education_title_accessibility" msgid="3701874093226957891">"Ontgrendelen via gezichtsherkenning instellen"</string>
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Je gezichtsmodel wordt definitief en op een beveiligde manier verwijderd.\n\nDaarna heb je je pincode, patroon of wachtwoord nodig om je telefoon te ontgrendelen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Ontgrendel je telefoon via gezichtsherkenning"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Vingerafdruk"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Bij gebruik van Ontgrendelen met vingerafdruk"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Vingerafdruk voor werk"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Vingerafdrukbeheer"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Vingerafdruk voor"</string>
@@ -576,11 +575,11 @@
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Volg het vingerafdrukicoon"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
     <string name="security_settings_udfps_enroll_repeat_message" msgid="2213106975297867798">"Tik en houd het vingerafdrukicoon vast elke keer dat het beweegt. Zo kan er meer van je vingerafdruk worden geregistreerd."</string>
-    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Leg het puntje van je vingertop op de sensor"</string>
+    <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"Houd het puntje van je vingertop op de sensor"</string>
     <string name="security_settings_udfps_enroll_left_edge_title" msgid="1944076382202470458">"Plaats de linkerrand van je vinger"</string>
     <string name="security_settings_udfps_enroll_right_edge_title" msgid="9036744264606447490">"Plaats de rechterrand van je vinger"</string>
     <string name="security_settings_sfps_enroll_finger_center_title" msgid="1320688855767675739">"Plaats het midden van je vingertop op de sensor"</string>
-    <string name="security_settings_sfps_enroll_fingertip_title" msgid="2737520837684516446">"Plaats het puntje van je vingertop op de sensor"</string>
+    <string name="security_settings_sfps_enroll_fingertip_title" msgid="2737520837684516446">"Houd het puntje van je vingertop op de sensor"</string>
     <string name="security_settings_sfps_enroll_left_edge_title" msgid="9022963735924413343">"Plaats de linkerkant van je vinger op de sensor"</string>
     <string name="security_settings_sfps_enroll_right_edge_title" msgid="823106857743394392">"Plaats tot slot de rechterkant van je vinger op de sensor"</string>
     <string name="security_settings_udfps_enroll_edge_message" msgid="4455253923746607702">"Leg de zijkant van je vingerafdruk op de sensor en houd vast. Doe dan hetzelfde aan de andere kant."</string>
@@ -589,16 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> procent vastgelegd"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Vingerafdruk vastleggen: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk toegevoegd"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Je kunt nu je vingerafdruk gebruiken om je tablet te ontgrendelen of om te bevestigen dat jij het bent, bijvoorbeeld als je inlogt bij apps of een aankoop goedkeurt"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Je kunt nu je vingerafdruk gebruiken om je tablet te ontgrendelen of voor verificatie, bijvoorbeeld als je inlogt bij apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Je kunt nu je vingerafdruk gebruiken om je apparaat te ontgrendelen of voor verificatie, bijvoorbeeld als je inlogt bij apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Je kunt nu je vingerafdruk gebruiken om je telefoon te ontgrendelen of voor verificatie, bijvoorbeeld als je inlogt bij apps"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="6064618417107305796">"Je kunt nu je vingerafdruk gebruiken om je tablet te ontgrendelen of om te bevestigen dat jij het bent, bijvoorbeeld als je inlogt bij apps of een aankoop goedkeurt"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="1948980056333872057">"Je kunt nu je vingerafdruk gebruiken om je apparaat te ontgrendelen of om te bevestigen dat jij het bent, bijvoorbeeld als je inlogt bij apps of een aankoop goedkeurt"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="3084541878035403475">"Je kunt nu je vingerafdruk gebruiken om je telefoon te ontgrendelen of om te bevestigen dat jij het bent, bijvoorbeeld als je inlogt bij apps of een aankoop goedkeurt"</string>
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Alleen ontgrendelen als het scherm aanstaat"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Het scherm moet aanstaan voordat je kunt ontgrendelen met je vingerafdruk. Zo wordt de kans op per ongeluk ontgrendelen kleiner."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Scherm, Ontgrendelen"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Later doen"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Raak de sensor opnieuw aan"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Leg de zijkant van je vingerafdruk op de sensor en houd vast. Doe dan hetzelfde aan de andere kant."</string>
@@ -2619,7 +2614,7 @@
     <string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"Uit"</string>
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"Werkt niet. Tik voor informatie."</string>
     <string name="accessibility_description_state_stopped" msgid="5364752492861199133">"Deze service werkt niet goed."</string>
-    <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"Sneltoetsen voor toegankelijkheid"</string>
+    <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"Snelkoppelingen voor toegankelijkheid"</string>
     <string name="enable_quick_setting" msgid="6648073323202243604">"Tonen in Snelle instellingen"</string>
     <string name="daltonizer_mode_deuteranomaly_title" msgid="4210949400493358650">"Rood-groen"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6392456967103014723">"Rood-groen"</string>
@@ -2813,7 +2808,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Geschiedenisdetails"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batterijgebruik"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Bekijk gebruik voor afgelopen 24 uur"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Bekijk gebruik sinds laatste volledige lading"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Gebruik sinds laatste volledige lading"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Batterijgebruik voor app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Gebruiksdetails"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Energieverbruik aanpassen"</string>
@@ -2994,25 +2989,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Batterijgebruik"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Sinds volledige lading"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Batterijgebruik beheren"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> totaal gebruik • <xliff:g id="TIME_1">^2</xliff:g> achtergrondgebruik\nsinds laatste volledige lading"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> totaal gebruik • <xliff:g id="TIME_1">^2</xliff:g> achtergrondgebruik\nsinds laatste volledige lading"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> totaal gebruik • <xliff:g id="TIME_1">^2</xliff:g> achtergrondgebruik\nin de afgelopen 24 u"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> totaal gebruik • <xliff:g id="TIME_1">^2</xliff:g> achtergrondgebruik\n gedurende <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Totaal gebruik minder dan een minuut sinds laatste volledige lading"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Totaal gebruik minder dan een minuut sinds laatste volledige lading"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Totaal gebruik minder dan een minuut in de afgelopen 24 u"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Totaal gebruik minder dan een minuut gedurende <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Achtergrondgebruik minder dan een minuut sinds laatste volledige lading"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Achtergrondgebruik minder dan een minuut sinds laatste volledige lading"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Achtergrondgebruik minder dan een minuut in de afgelopen 24 u"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Achtergrondgebruik minder dan een minuut gedurende <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> totaal gebruik sinds laatste volledige lading"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> totaal gebruik sinds laatste volledige lading"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> gebruikt in de afgelopen 24 u"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> totaal gebruik van <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> achtergrondgebruik sinds laatste volledige lading"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> achtergrondgebruik sinds laatste volledige lading"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> achtergrondgebruik in de afgelopen 24 u"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> achtergrondgebruik gedurende <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> totaal gebruik • Achtergrondgebruik minder dan een minuut\nsinds laatste volledige lading"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> totaal gebruik • achtergrondgebruik minder dan een minuut\nsinds laatste volledige lading"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> totaal gebruik • Achtergrondgebruik minder dan een minuut\nin de afgelopen 24 u"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> totaal gebruik • Achtergrondgebruik minder dan 1 min\nvan <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Geen gebruik sinds laatste volledige lading"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Geen gebruik sinds laatste volledige lading"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Geen gebruik in de afgelopen 24 u"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Andere gebruikers"</string>
@@ -3492,7 +3487,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> verwijderen van dit apparaat"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Instellingen voor vergrendelscherm"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Gebruikers toevoegen vanaf vergrendelscherm"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Overschakelen naar beheerder als gedockt"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Wil je jezelf verwijderen?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Gebruiker verwijderen?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Dit profiel verwijderen?"</string>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 09d1a34..a36a11a 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"କେବେ ବି ନୁହେଁ"</item>
-    <item msgid="5065465585332446709">"1 ମିନିଟ ପରେ"</item>
-    <item msgid="622807566366131941">"5 ମିନିଟ ପରେ"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 1939621..613340f 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"ଆପଣଙ୍କ ଫେସ ମଡେଲକୁ ସ୍ଥାୟୀ ଏବଂ ସୁରକ୍ଷିତ ଭାବରେ ଡିଲିଟ କରିଦିଆଯିବ।\n\nଡିଲିଟ କରିବା ପରେ ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ କରିବା ପାଇଁ ଆପଣ ଆପଣଙ୍କର PIN, ପାଟର୍ନ କିମ୍ବା ପାସୱାର୍ଡ ଆବଶ୍ୟକ କରିବେ।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ଆପଣଙ୍କର ଫୋନ୍ ଅନଲକ୍ କରିବାକୁ ଫେସ୍ ଅନଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ଟିପଚିହ୍ନ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ବ୍ୟବହାର କରିବା ସମୟରେ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ୱାର୍କ ପାଇଁ ଟିପଚିହ୍ନ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ଆଙ୍ଗୁଠି ଚିହ୍ନଗୁଡ଼ିକର ପରିଚାଳନା କରନ୍ତୁ"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ଏହା ପାଇଁ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> ଶତକଡ଼ା ପଞ୍ଜିକରଣ କରାଯାଇଛି"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ଟିପଚିହ୍ନ ପଞ୍ଜିକରଣ କରିବା ଶତକଡ଼ା <xliff:g id="PERCENTAGE">%d</xliff:g> ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ଟିପଚିହ୍ନ ଯୋଗ କରାଯାଇଛି"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ଆପଣଙ୍କ ଟାବଲେଟକୁ ଅନଲକ କରିବା କିମ୍ବା ଆପଣ ଆପ୍ସରେ ସାଇନ ଇନ କରିବା ବା ଏକ କ୍ରୟକୁ ଅନୁମୋଦନ ଦେବା ପରି କାର୍ଯ୍ୟଗୁଡ଼ିକ କରିବା ସମୟରେ, ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରିବାକୁ, ବର୍ତ୍ତମାନ ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ଆପଣଙ୍କ ଟାବଲେଟକୁ ଅନଲକ କରିବା କିମ୍ବା ଆପଣ ଆପ୍ସରେ ସାଇନ ଇନ କରିବା ପରି କାର୍ଯ୍ୟ କରିବା ସମୟରେ ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରିବା ପାଇଁ ବର୍ତ୍ତମାନ ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ଆପଣଙ୍କ ଡିଭାଇସକୁ ଅନଲକ କରିବା କିମ୍ବା ଆପଣ ଆପ୍ସରେ ସାଇନ ଇନ କରିବା ପରି କାର୍ଯ୍ୟ କରିବା ସମୟରେ ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରିବା ପାଇଁ ବର୍ତ୍ତମାନ ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ କରିବା କିମ୍ବା ଆପଣ ଆପ୍ସରେ ସାଇନ ଇନ କରିବା ପରି କାର୍ଯ୍ୟ କରିବା ସମୟରେ ଏହା ଆପଣ ବୋଲି ଯାଞ୍ଚ କରିବା ପାଇଁ ବର୍ତ୍ତମାନ ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ସ୍କ୍ରିନ ସକ୍ରିୟ ଥିବା ସମୟରେ କେବଳ ଅନଲକ କରନ୍ତୁ"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"ଆପଣ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ମାଧ୍ୟମରେ ଅନଲକ କରିବା ପୂର୍ବରୁ ସ୍କ୍ରିନ ସକ୍ରିୟ ଥିବା ଆବଶ୍ୟକ। ଭୁଲବଶତଃ ଅନଲକ ହେବା ସମ୍ଭାବନାକୁ ଏହା କମ୍ କରେ।"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ସ୍କ୍ରିନ, ଅନଲକ କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ଏହାକୁ ପରେ କରନ୍ତୁ"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ଉଠାନ୍ତୁ, ତା\'ପରେ ପୁଣି ସ୍ପର୍ଶ କରନ୍ତୁ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"ଆପଣଙ୍କ ଟିପଚିହ୍ନର ଗୋଟିଏ ପାର୍ଶ୍ୱକୁ ସେନ୍ସର ଉପରେ ଧରି ରଖି ଅନ୍ୟ ପାର୍ଶ୍ୱକୁ ସ୍ୱିଚ କରନ୍ତୁ"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ହିଷ୍ଟୋରୀ ବିବରଣୀ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ବ୍ୟାଟେରୀ ବ୍ୟବହାର"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ଗତ 24 ଘଣ୍ଟାର ବ୍ୟବହାର ଦେଖନ୍ତୁ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ଗତଥର ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ଠାରୁ ବ୍ୟବହାର ଦେଖ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ବ୍ୟବହାର ଦେଖ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ଆପର ବେଟେରୀ ବ୍ୟବହାର"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ବିବରଣୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ପାୱାର୍‌ ବ୍ୟବହାର ଆଡ୍‌ଜଷ୍ଟ କରନ୍ତୁ"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ବ୍ୟାଟେରୀର ବ୍ୟବହାର"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ପରଠାରୁ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ବ୍ୟାଟେରୀ ବ୍ୟବହାର ପରିଚାଳନା କରନ୍ତୁ"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ମୋଟ ବ୍ୟାଟେରୀ ବ୍ୟବହାର <xliff:g id="TIME_0">^1</xliff:g> • ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="TIME_1">^2</xliff:g> ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"ମୋଟ ବ୍ୟବହାର କରାଯାଇଛି <xliff:g id="TIME_0">^1</xliff:g> • ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="TIME_1">^2</xliff:g> ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ମୋଟ ବ୍ୟାଟେରୀ ବ୍ୟବହାର <xliff:g id="TIME_0">^1</xliff:g> • ଗତ 24 ଘଣ୍ଟାରେ <xliff:g id="TIME_1">^2</xliff:g> ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"ମୋଟ ବ୍ୟାଟେରୀ ବ୍ୟବହାର <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g>ରେ <xliff:g id="TIME_1">^2</xliff:g> ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ମୋଟ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ଗୋଟିଏ ମିନିଟରୁ କମ ସମୟ ପାଇଁ ମୋଟ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ଗତ 24 ଘଣ୍ଟାରେ ମୋଟ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g>ରେ ମୋଟ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ଗୋଟିଏ ମିନିଟରୁ କମ ସମୟ ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ଗତ 24 ଘଣ୍ଟାରେ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g>ରେ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ମୋଟ <xliff:g id="TIME">^1</xliff:g> ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ମୋଟ <xliff:g id="TIME">^1</xliff:g> ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ଗତ 24 ଘଣ୍ଟାରେ ମୋଟ <xliff:g id="TIME">^1</xliff:g> ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>ରେ ମୋଟ <xliff:g id="TIME_0">^1</xliff:g> ପାଇଁ ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="TIME">^1</xliff:g> ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ <xliff:g id="TIME">^1</xliff:g> ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ଗତ 24 ଘଣ୍ଟାରେ <xliff:g id="TIME">^1</xliff:g> ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g>ରେ <xliff:g id="TIME_0">^1</xliff:g> ପାଇଁ ପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ମୋଟ ବ୍ୟାଟେରୀ ବ୍ୟବହାର <xliff:g id="TIME">^1</xliff:g> • ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ଯବହାର କରାଯାଇଛି"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"ମୋଟ ବ୍ୟବହାର କରାଯାଇଛି <xliff:g id="TIME">^1</xliff:g> • ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ଗୋଟିଏ ମିନିଟରୁ କମ ସମୟ ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ମୋଟ ବ୍ୟାଟେରୀ ବ୍ୟବହାର <xliff:g id="TIME">^1</xliff:g> • ଗତ 24 ଘଣ୍ଟାରେ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"ମୋଟ ବ୍ୟାଟେରୀ ବ୍ୟବହାର <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g>ରେ ଗୋଟିଏ ମିନିଟରୁ କମ୍ ସମୟ ପାଇଁ\nପୃଷ୍ଠପଟରେ ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ଗତଥର ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ବ୍ୟବହାର କରାଯାଇନାହିଁ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ବ୍ୟବହାର କରାଯାଇ ନାହିଁ"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ଗତ 24 ଘଣ୍ଟାରେ ବ୍ୟବହାର କରାଯାଇନାହିଁ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାମାନେ"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ଏହି ଡିଭାଇସ୍‌ରୁ <xliff:g id="USER_NAME">%1$s</xliff:g> ଙ୍କୁ ଡିଲିଟ୍‍ କରନ୍ତୁ"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ଲକ ସ୍କ୍ରିନ ସେଟିଂସ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ଲକ୍‌ ସ୍କ୍ରିନ୍‌ରୁ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ଡକ କରାଯିବା ସମୟରେ ଆଡମିନ ଉପଯୋଗକର୍ତ୍ତାକୁ ସ୍ୱିଚ କରନ୍ତୁ"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ନିଜକୁ ଡିଲିଟ୍‌ କରିବେ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ଏହି ୟୁଜରଙ୍କୁ ଡିଲିଟ୍‍ କରିବେ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ଏହି ପ୍ରୋଫାଇଲ୍‌କୁ କାଢ଼ିଦେବେ?"</string>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 55a86d1..8d01382 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
-    <item msgid="5065465585332446709">"1 ਮਿੰਟ ਬਾਅਦ"</item>
-    <item msgid="622807566366131941">"5 ਮਿੰਟਾਂ ਬਾਅਦ"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4780327..85a26f7 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"ਤੁਹਾਡੇ ਚਿਹਰੇ ਦਾ ਮਾਡਲ ਪੱਕੇ ਤੌਰ \'ਤੇ ਅਤੇ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।\n\nਮਿਟਾਉਣ ਤੋਂ ਬਾਅਦ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਪਿੰਨ, ਪੈਟਰਨ ਜਾਂ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ ਫ਼ੇਸ ਅਣਲਾਕ ਵਰਤੋ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਵਰਤਣ ਵੇਲੇ"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> ਪ੍ਰਤੀਸ਼ਤ ਦਰਜ ਕੀਤਾ ਗਿਆ"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਰਜ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ <xliff:g id="PERCENTAGE">%d</xliff:g> ਫ਼ੀਸਦ ਹੋ ਗਈ ਹੈ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਹੋ ਗਿਆ"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ਹੁਣ ਤੁਸੀਂ ਆਪਣਾ ਟੈਬਲੈੱਟ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਆਪਣੀ ਪਛਾਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ, ਜਿਵੇਂ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਦੇ ਹੋ ਜਾਂ ਕਿਸੇ ਖਰੀਦ ਨੂੰ ਮਨਜ਼ੂਰੀ ਦਿੰਦੇ ਹੋ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ਹੁਣ ਤੁਸੀਂ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਆਪਣੀ ਪਛਾਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ, ਜਿਵੇਂ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਦੇ ਹੋ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ਹੁਣ ਤੁਸੀਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਆਪਣੀ ਪਛਾਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ, ਜਿਵੇਂ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਦੇ ਹੋ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ਹੁਣ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਆਪਣੀ ਪਛਾਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ, ਜਿਵੇਂ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਦੇ ਹੋ"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ਸਿਰਫ਼ ਸਕ੍ਰੀਨ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਹੀ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਸਕ੍ਰੀਨ ਚਾਲੂ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ। ਇਸ ਵਿੱਚ ਗਲਤੀ ਨਾਲ ਅਣਲਾਕ ਹੋਣ ਦੀ ਸੰਭਾਵਨਾ ਘੱਟ ਜਾਂਦੀ ਹੈ।"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ਸਕ੍ਰੀਨ, ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸਪਰਸ਼ ਕਰੋ"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"ਆਪਣੀ ਉਂਗਲ ਦੇ ਇੱਕ ਪਾਸੇ ਨੂੰ ਸੈਂਸਰ \'ਤੇ ਲਗਾ ਕੇ ਰੱਖੋ, ਫਿਰ ਦੂਜੇ ਪਾਸੇ ਨੂੰ ਲਗਾਓ"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ਇਤਿਹਾਸ ਵੇਰਵੇ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਹੋਈ ਵਰਤੋਂ ਦੇਖੋ"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ਪਿਛਲੇ ਪੂਰੇ ਚਾਰਜ ਤੋਂ ਬਾਅਦ ਹੋਈ ਵਰਤੋਂ ਦੇਖੋ"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਵਰਤੋਂ ਨੂੰ ਦੇਖੋ"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ਐਪ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ਪਾਵਰ ਵਰਤੋਂ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ਪੂਰੇ ਚਾਰਜ ਤੋਂ ਬਾਅਦ"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"ਬੈਟਰੀ ਵਰਤੋਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ \n ਕੁੱਲ ਵਰਤੋਂ <xliff:g id="TIME_0">^1</xliff:g> • ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ <xliff:g id="TIME_1">^2</xliff:g>"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> ਕੁੱਲ • <xliff:g id="TIME_1">^2</xliff:g> ਬੈਕਗ੍ਰਾਊਂਡ\nਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ \nਕੁੱਲ ਵਰਤੋਂ <xliff:g id="TIME_0">^1</xliff:g> • ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> ਕੁੱਲ • <xliff:g id="TIME_PERIOD">^3</xliff:g> ਦੌਰਾਨ\n ਤੱਕ ਬੈਕਗ੍ਰਾਊਂਡ<xliff:g id="TIME_1">^2</xliff:g> ਵਿੱਚ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਹੋਈ"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਕੁੱਲ ਵਰਤੋਂ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਕੁੱਲ ਵਰਤੋਂ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਕੁੱਲ ਵਰਤੋਂ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"ਪਿਛਲੇ <xliff:g id="TIME_PERIOD">^1</xliff:g> ਦੌਰਾਨ ਕੁੱਲ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤੀ ਗਈ"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤੀ ਗਈ"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ਦੌਰਾਨ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਬੈਕਗ੍ਰਾਊਂਡ"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਕੁੱਲ ਵਰਤੋਂ <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ <xliff:g id="TIME">^1</xliff:g> ਕੁੱਲ ਵਰਤੋਂ"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਕੁੱਲ ਵਰਤੋਂ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ਦੌਰਾਨ ਕੁੱਲ <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ <xliff:g id="TIME">^1</xliff:g> ਤੱਕ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤੀ ਗਈ"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ <xliff:g id="TIME">^1</xliff:g> ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ <xliff:g id="TIME">^1</xliff:g> ਤੱਕ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤੀ ਗਈ"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ਲਈ <xliff:g id="TIME_0">^1</xliff:g> ਬੈਕਗ੍ਰਾਊਂਡ"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ \nਕੁੱਲ ਵਰਤੋਂ <xliff:g id="TIME">^1</xliff:g> • ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> ਕੁੱਲ • ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ\nਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ \nਕੁੱਲ ਵਰਤੋਂ <xliff:g id="TIME">^1</xliff:g> • ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"ਕੁੱਲ <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> ਦੌਰਾਨ ਇੱਕ ਮਿੰਟ ਤੱਕ ਬੈਕਗ੍ਰਾਊਂਡ\n ਵਿੱਚ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਹੋਈ"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਕੋਈ ਵਰਤੋਂ ਨਹੀਂ"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਕੋਈ ਵਰਤੋਂ ਨਹੀਂ"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਕੋਈ ਵਰਤੋਂ ਨਹੀਂ"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ਹੋਰ ਵਰਤੋਂਕਾਰ"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਮਿਟਾਓ"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"ਲਾਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"ਲਾਕ ਸਕ੍ਰੀਨ ਤੋਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ਡੌਕ ਕੀਤੇ ਜਾਣ \'ਤੇ ਪ੍ਰਸ਼ਾਸਕ ਵਰਤੋਂਕਾਰ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ਕੀ ਖੁਦ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ਇਹ ਵਰਤੋਂਕਾਰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ਕੀ ਇਹ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 89e9936..c591eb3 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nigdy"</item>
-    <item msgid="5065465585332446709">"Po minucie"</item>
-    <item msgid="622807566366131941">"Po 5 minutach"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 02557d9..e61b7dd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Model twarzy zostanie trwale i bezpiecznie usunięty.\n\nPo usunięciu tych danych będziesz potrzebować kodu PIN, wzoru lub hasła do odblokowywania telefonu."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Używaj rozpoznawania twarzy do odblokowywania telefonu"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Odcisk palca"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Podczas odblokowywania odciskiem palca"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Odcisk palca – profil służbowy"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Zarządzaj odciskami"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Używaj odcisku palca do"</string>
@@ -597,16 +596,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Zarejestrowano <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Rejestruję odcisk palca – <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Odcisk palca dodany"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Możesz teraz używać odcisku palca do odblokowywania tabletu oraz weryfikacji tożsamości, na przykład podczas logowania się w aplikacjach i zatwierdzania zakupów"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Możesz teraz używać odcisku palca do odblokowywania tabletu oraz weryfikacji tożsamości, na przykład podczas logowania się w aplikacjach"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Możesz teraz używać odcisku palca do odblokowywania urządzenia oraz weryfikacji tożsamości, na przykład podczas logowania się w aplikacjach"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Możesz teraz używać odcisku palca do odblokowywania telefonu oraz weryfikacji tożsamości, na przykład podczas logowania się w aplikacjach"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Odblokowuj tylko przy włączonym ekranie"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Zanim odblokujesz urządzenie odciskiem palca, ekran musi zostać włączony. Dzięki temu trudniej przypadkowo odblokować urządzenie."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekran, odblokowywanie"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Później"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Podnieś i przyłóż ponownie"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Umieść na czytniku palec bokiem i przytrzymaj, a następnie obróć na drugi bok"</string>
@@ -1563,8 +1561,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Niedostępne, ponieważ włączony jest tryb snu"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Używaj wygaszacza ekranu"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Podczas ładowania lub po zadokowaniu"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Po zadokowaniu i podczas ładowania"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Podczas ładowania"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Po zadokowaniu"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nigdy"</string>
@@ -2876,7 +2873,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Historia – szczegóły"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Wykorzystanie baterii"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Wyświetl użycie z 24 godzin"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Zobacz zużycie od ostatniego pełnego naładowania"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Wyświetl wykorzystanie od ostatniego pełnego naładowania"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Wykorzystanie baterii przez aplikacje"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Szczegóły użycia"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Dostosuj wykorzystanie energii"</string>
@@ -3071,25 +3068,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Wykorzystanie baterii"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od pełnego naładowania"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Zarządzaj wykorzystaniem baterii"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Łącznie <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> w tle\nod ostatniego pełnego naładowania"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Łącznie <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> w tle \nod ostatniego pełnego naładowania"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Łącznie <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> w tle w ciągu\nostatnich 24 godzin"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Łącznie <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> w tle\nw okresie <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Łącznie mniej niż minutę od ostatniego pełnego naładowania"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Łącznie mniej niż minutę od ostatniego pełnego naładowania"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Łącznie mniej niż minutę w ciągu ostatnich 24 godzin"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Łącznie mniej niż minutę w okresie <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"W tle mniej niż minutę od ostatniego pełnego naładowania"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"W tle mniej niż minutę od ostatniego pełnego naładowania"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"W tle mniej niż minutę w ciągu ostatnich 24 godzin"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"W tle mniej niż minutę w godzinach <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Łącznie <xliff:g id="TIME">^1</xliff:g> od ostatniego pełnego naładowania"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Łącznie <xliff:g id="TIME">^1</xliff:g> od ostatniego pełnego naładowania"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Łącznie <xliff:g id="TIME">^1</xliff:g> w ciągu ostatnich 24 godzin"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Łącznie <xliff:g id="TIME_0">^1</xliff:g> w okresie <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> w tle od ostatniego pełnego naładowania"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> w tle od ostatniego pełnego naładowania"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> w tle w ciągu ostatnich 24 godzin"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> w tle przez <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Łącznie <xliff:g id="TIME">^1</xliff:g> • \n w tle od ostatniego pełnego naładowania"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Łącznie <xliff:g id="TIME">^1</xliff:g> • W tle mniej niż minutę\nod ostatniego pełnego naładowania"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Łącznie <xliff:g id="TIME">^1</xliff:g> • W tle mniej niż minutę\nw ciągu ostatnich 24 godzin"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Łącznie <xliff:g id="TIME_0">^1</xliff:g> • W tle mniej niż minutę\nw godzinach <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Brak użycia od ostatniego pełnego naładowania"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Brak wykorzystania od ostatniego pełnego naładowania"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Brak wykorzystania w ciągu ostatnich 24 godzin"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Inni użytkownicy"</string>
@@ -3577,7 +3574,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Usuń użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g> z tego urządzenia"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Ustawienia ekranu blokady"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Dodawaj użytkowników na ekranie blokady"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Przełącz się na administratora, kiedy urządzenie jest zadokowane"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Chcesz usunąć siebie?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Usunąć tego użytkownika?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Usunąć ten profil?"</string>
@@ -4302,8 +4300,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na Twoje życzenie Android blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android na żądanie blokuje tę kategorię powiadomień na urządzeniu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android na żądanie blokuje tę grupę powiadomień na urządzeniu"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Ta aplikacja nie wysyła powiadomień"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorie"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Inne"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 962b895..6d6a91b 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nunca"</item>
-    <item msgid="5065465585332446709">"Após um minuto"</item>
-    <item msgid="622807566366131941">"Após cinco minutos"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ee112d2..eb9e6be 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -594,10 +594,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Agora você pode usar sua impressão digital para desbloquear o tablet ou confirmar sua identidade, como ao fazer login em apps ou aprovar uma compra"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Agora, você pode usar a impressão digital para desbloquear o tablet ou confirmar sua identidade, como ao fazer login em apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Agora, você pode usar a impressão digital para desbloquear o dispositivo ou confirmar sua identidade, como ao fazer login em apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Agora, você pode usar a impressão digital para desbloquear o smartphone ou confirmar sua identidade, como ao fazer login em apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloquear somente quando a tela estiver ativada"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"A tela precisa estar ativada para desbloquear o dispositivo com sua impressão digital. Isso diminui as chances de desbloqueio acidental."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Tela, Desbloqueio"</string>
@@ -2815,7 +2817,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalhes do histórico"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Uso da bateria"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Ver o uso nas últimas 24 horas"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Ver o uso desde a última carga completa"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Mostrar o uso desde a última carga total"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Uso da bateria pelo app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalhes de uso"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar uso de energia"</string>
@@ -2996,25 +2998,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Uso da bateria"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Desde a carga completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gerenciar uso da bateria"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Total: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndesde a última carga completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Total de <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndesde a última carga completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Total: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\nnas últimas 24h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Total: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\nno período entre <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total de menos de um minuto desde a última carga completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total de menos de um minuto desde a última carga completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total de menos de um minuto nas últimas 24h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total de menos de um minuto no período entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menos de um minuto em segundo plano desde a última carga completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menos de um minuto em segundo plano desde a última carga completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menos de um minuto em segundo plano nas últimas 24h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menos de um minuto em segundo plano no período entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Total de <xliff:g id="TIME">^1</xliff:g> desde a última carga completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Total de <xliff:g id="TIME">^1</xliff:g> desde a última carga completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Total de <xliff:g id="TIME">^1</xliff:g> nas últimas 24h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Total de <xliff:g id="TIME_0">^1</xliff:g> no período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> em segundo plano desde a última carga completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> em segundo plano desde a última carga completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> em segundo plano nas últimas 24h"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> em segundo plano no período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Total: <xliff:g id="TIME">^1</xliff:g> • Menos de um minuto em segundo plano\ndesde a última carga completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Total de <xliff:g id="TIME">^1</xliff:g> • em segundo plano por menos de um minuto\ndesde a última carga completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Total: <xliff:g id="TIME">^1</xliff:g> • Menos de um minuto em segundo plano\nnas últimas 24h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Total: <xliff:g id="TIME_0">^1</xliff:g> • Menos de um minuto em segundo plano\nno período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Sem uso desde a última carga completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Não houve uso desde a última carga completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Sem uso nas últimas 24h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Outros usuários"</string>
@@ -3494,7 +3496,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Configurações de tela de bloqueio"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Adicionar usuários na tela de bloqueio"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Mudar para usuário admin quando encaixado na base"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Excluir a si mesmo?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Excluir este usuário?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remover este perfil?"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 1504336..0f8dccd 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nunca"</item>
-    <item msgid="5065465585332446709">"Após 1 minuto"</item>
-    <item msgid="622807566366131941">"Após 5 minutos"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a10e5aa..5f1ada2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> por cento de inscrições"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Inscrição da impressão digital: <xliff:g id="PERCENTAGE">%d</xliff:g> por cento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Já pode usar a sua impressão digital para desbloquear o tablet ou validar a sua identidade, como quando inicia sessão em apps ou aprova uma compra"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Já pode usar a impressão digital para desbloquear o tablet ou validar a sua identidade, como quando inicia sessão em apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Já pode usar a impressão digital para desbloquear o dispositivo ou validar a sua identidade, como quando inicia sessão em apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Já pode usar a impressão digital para desbloquear o telemóvel ou validar a sua identidade, como quando inicia sessão em apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloquear apenas quando o ecrã está ligado"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"O ecrã tem de estar ativado antes de poder desbloquear com a sua impressão digital. Isto torna o desbloqueio acidental menos provável."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ecrã, desbloqueio"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalhes do histórico"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Utilização da bateria"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Veja a utilização das últimas 24 horas"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Ver uso desde o último carregamento completo"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Ver uso desde o último carreg. completo"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Utilização da bateria para apps"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Utilizar detalhes"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar utilização de energia"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Utilização da bateria"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Desde o carregamento completo"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gerir a utilização da bateria"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> no total • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndesde o último carregamento completo"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> no total • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndesde o último carregamento completo"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> no total • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndurante as últimas 24 h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> no total • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\nno período seguinte: <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Menos de um minuto no total desde o último carregamento completo"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Menos de um minuto no total desde o último carregamento completo"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Menos de um minuto no total nas últimas 24 h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Menos de um minuto no total no período seguinte: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menos de um minuto em segundo plano desde o último carregamento completo"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menos de um minuto em segundo plano desde o último carregamento completo"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menos de um minuto em segundo plano nas últimas 24 h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menos de um minuto em segundo plano no período seguinte: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> no total desde o último carregamento completo"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> no total desde o último carregamento completo"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> no total nas últimas 24 h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Total de <xliff:g id="TIME_0">^1</xliff:g> para <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> em segundo plano desde o último carregamento completo"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> em segundo plano desde o último carregamento completo"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> em segundo plano nas últimas 24 h"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> em segundo plano no período seguinte: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> no total • Menos de um minuto em segundo plano\ndesde o último carregamento completo"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> no total • menos de minuto em segundo plano\ndesde o último carregamento completo"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> no total • Menos de um minuto em segundo plano\nnas últimas 24 h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Total: <xliff:g id="TIME_0">^1</xliff:g> • Menos de um minuto em segundo plano\nno período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nenhuma utilização desde o último carregamento"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Sem uso desde o último carregamento"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nenhuma utilização nas últimas 24 h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Outros utilizadores"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> deste dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Definições do ecrã de bloqueio"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Adicionar utilizadores a partir do ecrã de bloqueio"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Mudar p/ utilizador administrador quando ancorado"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Eliminar-se a si próprio?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Eliminar este utilizador?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remover este perfil?"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 962b895..6d6a91b 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nunca"</item>
-    <item msgid="5065465585332446709">"Após um minuto"</item>
-    <item msgid="622807566366131941">"Após cinco minutos"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ee112d2..eb9e6be 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -594,10 +594,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Agora você pode usar sua impressão digital para desbloquear o tablet ou confirmar sua identidade, como ao fazer login em apps ou aprovar uma compra"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Agora, você pode usar a impressão digital para desbloquear o tablet ou confirmar sua identidade, como ao fazer login em apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Agora, você pode usar a impressão digital para desbloquear o dispositivo ou confirmar sua identidade, como ao fazer login em apps"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Agora, você pode usar a impressão digital para desbloquear o smartphone ou confirmar sua identidade, como ao fazer login em apps"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Desbloquear somente quando a tela estiver ativada"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"A tela precisa estar ativada para desbloquear o dispositivo com sua impressão digital. Isso diminui as chances de desbloqueio acidental."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Tela, Desbloqueio"</string>
@@ -2815,7 +2817,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalhes do histórico"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Uso da bateria"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Ver o uso nas últimas 24 horas"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Ver o uso desde a última carga completa"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Mostrar o uso desde a última carga total"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Uso da bateria pelo app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalhes de uso"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustar uso de energia"</string>
@@ -2996,25 +2998,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Uso da bateria"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Desde a carga completa"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gerenciar uso da bateria"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Total: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndesde a última carga completa"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Total de <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\ndesde a última carga completa"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Total: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\nnas últimas 24h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Total: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> em segundo plano\nno período entre <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Total de menos de um minuto desde a última carga completa"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Total de menos de um minuto desde a última carga completa"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Total de menos de um minuto nas últimas 24h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Total de menos de um minuto no período entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Menos de um minuto em segundo plano desde a última carga completa"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Menos de um minuto em segundo plano desde a última carga completa"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Menos de um minuto em segundo plano nas últimas 24h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Menos de um minuto em segundo plano no período entre <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Total de <xliff:g id="TIME">^1</xliff:g> desde a última carga completa"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Total de <xliff:g id="TIME">^1</xliff:g> desde a última carga completa"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Total de <xliff:g id="TIME">^1</xliff:g> nas últimas 24h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Total de <xliff:g id="TIME_0">^1</xliff:g> no período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> em segundo plano desde a última carga completa"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> em segundo plano desde a última carga completa"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> em segundo plano nas últimas 24h"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> em segundo plano no período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Total: <xliff:g id="TIME">^1</xliff:g> • Menos de um minuto em segundo plano\ndesde a última carga completa"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Total de <xliff:g id="TIME">^1</xliff:g> • em segundo plano por menos de um minuto\ndesde a última carga completa"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Total: <xliff:g id="TIME">^1</xliff:g> • Menos de um minuto em segundo plano\nnas últimas 24h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Total: <xliff:g id="TIME_0">^1</xliff:g> • Menos de um minuto em segundo plano\nno período entre <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Sem uso desde a última carga completa"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Não houve uso desde a última carga completa"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Sem uso nas últimas 24h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Outros usuários"</string>
@@ -3494,7 +3496,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Configurações de tela de bloqueio"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Adicionar usuários na tela de bloqueio"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Mudar para usuário admin quando encaixado na base"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Excluir a si mesmo?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Excluir este usuário?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Remover este perfil?"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 93427b7..9bfbc82 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Niciodată"</item>
-    <item msgid="5065465585332446709">"După un minut"</item>
-    <item msgid="622807566366131941">"După cinci minute"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8bd81e0..a1733fd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -456,8 +456,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Modelul facial se va șterge definitiv și în siguranță.\n\nDupă ștergere, vei avea nevoie de codul PIN, de model sau de parolă ca să îți deblochezi telefonul."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Folosește Deblocarea facială ca să-ți deblochezi telefonul"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Amprentă"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Când folosești Deblocarea cu amprenta"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Amprentă pentru lucru"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Gestionează amprentele"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Folosește amprenta la"</string>
@@ -599,16 +598,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Amprentă adăugată"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Acum îți poți folosi amprenta pentru a-ți debloca tableta sau pentru a-ți confirma identitatea, de exemplu, când te conectezi la aplicații sau aprobi o achiziție"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Acum vă puteți folosi amprenta pentru a vă debloca tableta sau pentru a vă confirma identitatea, de exemplu, când vă conectați la aplicații"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Acum vă puteți folosi amprenta pentru a vă debloca dispozitivul sau pentru a vă confirma identitatea, de exemplu, când vă conectați la aplicații"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Acum vă puteți folosi amprenta pentru a vă debloca telefonul sau pentru a vă confirma identitatea, de exemplu, când vă conectați la aplicații"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Deblochează numai când ecranul este activ"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ecranul trebuie să fie activat ca să poți debloca folosind amprenta. Astfel, scade riscul de deblocare accidentală."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ecran, Deblocare"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Mai târziu"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Ridică, apoi atinge din nou"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Așează partea laterală a degetului pe senzor și menține, apoi procedează la fel cu cealaltă parte"</string>
@@ -2850,7 +2848,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalii istoric"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Utilizarea bateriei"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Vezi utilizarea din ultimele 24 de ore"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Vezi utilizarea de la ultima încărcare completă"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Vezi utilizarea de la ultima încărcare completă"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Utilizarea bateriei pentru aplicații"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Detalii despre utilizare"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Ajustează utilizarea de energie"</string>
@@ -3038,25 +3036,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Utilizarea bateriei"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"De la încărcarea completă"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Gestionează utilizarea bateriei"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> în total • <xliff:g id="TIME_1">^2</xliff:g> în fundal\nde la ultima încărcare completă"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> în total • <xliff:g id="TIME_1">^2</xliff:g> în fundal\nde la ultima încărcare completă"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> în total • <xliff:g id="TIME_1">^2</xliff:g> în fundal,\nîn ultimele 24 de ore"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> în total • <xliff:g id="TIME_1">^2</xliff:g> în fundal,\nîn intervalul <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"În total mai puțin de un minut de la ultima încărcare completă"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"În total mai puțin de un minut de la ultima încărcare completă"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"În total mai puțin de un minut pentru ultimele 24 h"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"În total mai puțin de un minut pentru <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Mai puțin de un minut în fundal de la ultima încărcare completă"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Mai puțin de un minut în fundal de la ultima încărcare completă"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Mai puțin de un minut în fundal, în ultimele 24 h"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Mai puțin de un minut în fundal, în intervalul <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> în total de la ultima încărcare completă"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> în total de la ultima încărcare completă"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> în total în ultimele 24 h"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> în total pentru <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> în fundal de la ultima încărcare completă"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> în fundal de la ultima încărcare completă"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> în fundal, în ultimele 24 h"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> în fundal, în intervalul <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> în total • Mai puțin de un minut în fundal\nde la ultima încărcare completă"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> în total • Mai puțin de un minut în fundal\nde la ultima încărcare completă"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> în total • Mai puțin de un minut în fundal,\nîn ultimele 24 h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> în total • mai puțin de un minut în fundal,\nîn intervalul <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Nu a fost folosită de la ultima încărcare completă"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Nu a fost folosită de la ultima încărcare completă"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nu a fost folosită în ultimele 24 h"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Alți utilizatori"</string>
@@ -3540,7 +3538,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Șterge <xliff:g id="USER_NAME">%1$s</xliff:g> de pe dispozitiv"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Setările ecranului de blocare"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Adaugă utilizatori din ecranul de blocare"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Treci la administrator când este andocat"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Te excluzi ca utilizator?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ștergi utilizatorul?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Elimini acest profil?"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c7d8668..4fd838a 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Никогда"</item>
-    <item msgid="5065465585332446709">"Через 1 минуту"</item>
-    <item msgid="622807566366131941">"Через 5 минут"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 017a15c..863889a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Модель вашего лица будет удалена навсегда.\n\n После этого для разблокировки телефона будет требоваться PIN-код, пароль или графический ключ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Используйте фейсконтроль для разблокировки телефона"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Отпечатки пальцев"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Когда применять разблокировку по отпечатку пальца"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Отпечаток для работы"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Управление отпечатками"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Для чего использовать"</string>
@@ -597,16 +596,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Процент выполнения: <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Процент выполнения задачи по добавлению отпечатка пальца: <xliff:g id="PERCENTAGE">%d</xliff:g>."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечаток добавлен"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Теперь вы можете использовать отпечаток пальца, чтобы снимать блокировку планшета и подтверждать свою личность, например для входа в приложения и одобрения покупок."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Теперь вы можете использовать отпечаток пальца, чтобы разблокировать планшет или подтверждать свою личность для входа в приложения и других действий."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Теперь вы можете использовать отпечаток пальца, чтобы разблокировать устройство или подтверждать свою личность для входа в приложения и других действий."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Теперь вы можете использовать отпечаток пальца, чтобы разблокировать телефон или подтверждать свою личность для входа в приложения и других действий."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Разблокировка только при включенном экране"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Разблокировать устройство можно, только когда экран включен. Это снижает вероятность случайной разблокировки."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Экран, разблокировка"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Не сейчас"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Поднимите палец и снова приложите его к сканеру"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Наклоните палец вбок, приложите к датчику и удерживайте. Затем наклоните палец в противоположную сторону и повторите действия."</string>
@@ -1563,8 +1561,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Недоступно в ночном режиме"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Использовать заставку"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Во время зарядки и на док-станции"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"На док-станции и во время зарядки"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Во время зарядки"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"На док-станции"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Никогда"</string>
@@ -2876,7 +2873,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Подробная история"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Расход заряда батареи"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Расход заряда за последние 24 часа"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Расход заряда с момента полной зарядки"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Данные об исп. с момента полной зарядки"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Расход заряда батареи для приложений"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Расход батареи"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Режим энергопотребления"</string>
@@ -3071,25 +3068,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Расход заряда"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"С момента полной зарядки"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Управление расходом заряда"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Всего <xliff:g id="TIME_0">^1</xliff:g> • В фоновом режиме <xliff:g id="TIME_1">^2</xliff:g>\nс момента последней полной зарядки"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Всего <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> в фоновом режиме\nс момента последней полной зарядки"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Всего <xliff:g id="TIME_0">^1</xliff:g> • В фоновом режиме <xliff:g id="TIME_1">^2</xliff:g>\nза последние 24 часа"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Всего <xliff:g id="TIME_0">^1</xliff:g> • В фоновом режиме <xliff:g id="TIME_1">^2</xliff:g>\nв период <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Всего меньше минуты с момента последней зарядки"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Всего меньше минуты с момента последней полной зарядки"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Всего меньше минуты за последние 24 часа"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Всего меньше минуты в период <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Меньше минуты в фоновом режиме с момента последней полной зарядки"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Меньше минуты в фоновом режиме с момента последней полной зарядки"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Меньше минуты в фоновом режиме за последние 24 часа"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"В фоновом режиме меньше минуты в период <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Всего <xliff:g id="TIME">^1</xliff:g> с момента последней полной зарядки"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Всего <xliff:g id="TIME">^1</xliff:g> с момента последней полной зарядки"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Всего <xliff:g id="TIME">^1</xliff:g> за последние 24 часа"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Всего <xliff:g id="TIME_0">^1</xliff:g> в период <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> в фоновом режиме с момента последней полной зарядки"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> в фоновом режиме с момента последней полной зарядки"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> в фоновом режиме за последние 24 часа"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> в фоновом режиме в период <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Всего <xliff:g id="TIME">^1</xliff:g> • В фоновом режиме меньше минуты\nс момента последней полной зарядки"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Всего <xliff:g id="TIME">^1</xliff:g> • Меньше минуты в фоновом режиме\nс момента последней полной зарядки"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Всего <xliff:g id="TIME">^1</xliff:g> • В фоновом режиме меньше минуты\nза последние 24 часа"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Всего <xliff:g id="TIME_0">^1</xliff:g> • В фоновом режиме меньше минуты\nв период <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Батарея не использовалась с момента последней полной зарядки"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Батарея не использовалась с момента последней полной зарядки"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Батарея не использовалась за последние 24 часа"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Другие пользователи"</string>
@@ -3577,7 +3574,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Удалить пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Заблокированный экран"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Добавить пользователя ­на заблокированном экране"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Переключаться на администратора при подключении к док-станции"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Удалить ваш профиль?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Удалить пользователя?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Удалить профиль?"</string>
@@ -4302,8 +4300,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Вы отключили уведомления от этого приложения."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Вы отключили уведомления этой категории."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Вы отключили эту группу уведомлений"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Это приложение не отправляет уведомления"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Категории"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Другие"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index a8bf675..ecb3b12 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"කිසිදා නැත"</item>
-    <item msgid="5065465585332446709">"මිනිත්තු 1කට පසුව"</item>
-    <item msgid="622807566366131941">"මිනිත්තු 5කට පසුව"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index f53a545..0859475 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"ඔබගේ මුහුණු ආකෘතිය ස්ථිරව සහ ආරක්ෂිතව මකනු ඇත.\n\nමැකීමෙන් පසුව, ඔබගේ දුරකථනය අගුලු හැරීමට ඔබට ඔබගේ PIN, රටාව හෝ මුරපදය අවශ්‍ය වනු ඇත."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ඔබගේ දුරකථනය අගුලු හැරීමට මුහුණෙන් අගුළු හැරීම භාවිත කරන්න"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"ඇඟිලි සලකුණ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"ඇඟිලි සලකුණු අගුළු හැරීම භාවිතා කරන විට"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"කාර්යාලය සඳහා ඇඟිලි සලකුණ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"ඇඟිලි සලකුණු කළමනාකරණය කරන්න"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"මෙය සඳහා ඇඟිලි සලකුණු භාවිත කරන්න"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"ලියාපදිංචි වූයේ සියයට <xliff:g id="PERCENTAGE">%d</xliff:g>යි"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"ඇඟිලි සලකුණ සියයට <xliff:g id="PERCENTAGE">%d</xliff:g>ක් ලියාපදිංචි කරමින්"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ඇඟිලි සලකුණ එක් කරන ලදී"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"දැන් ඔබට ඔබේ ටැබ්ලටය අගුලු හැරීමට හෝ ඔබ යෙදුම් වෙත පුරනය වන විට හෝ මිලදී ගැනීමක් අනුමත කරන විට ඒ ඔබ බව සත්‍යාපනය කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කළ හැක"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"දැන් ඔබට ඔබගේ ටැබ්ලටය අගුලු හැරීමට හෝ ඔබ යෙදුම්වලට පුරන විට වැනි අවස්ථාවල, ඒ ඔබ බව සත්‍යාපනය කිරීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කළ හැකිය"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"දැන් ඔබට ඔබගේ උපාංගය අගුලු හැරීමට හෝ ඔබ යෙදුම්වලට පුරන විට වැනි අවස්ථාවල, ඒ ඔබ බව සත්‍යාපනය සකිරීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කළ හැකිය"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"දැන් ඔබට ඔබගේ දුරකථනය අගුලු හැරීමට හෝ ඔබ යෙදුම්වලට පුරන විට වැනි අවස්ථාවල, ඒ ඔබ බව සත්‍යාපනය සකිරීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කළ හැකිය"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"තිරය ක්‍රියාත්මක විට පමණක් අගුළු හරින්න"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"ඔබට ඔබේ ඇඟිලි සලකුණ සමග අගුළු හැරීමට පෙර තිරය ක්‍රියාත්මක විය යුතු වේ. මෙය අහම්බෙන් අගුළු හැරීමේ හැකියාව අඩු කරයි."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"තිර, අගුළු හැරීම"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"පසුව එය කරන්න"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"ඔසවා, පසුව නැවත ස්පර්ශ කරන්න"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"ඔබගේ ඇඟිලි සලකුණුණෙහි පැත්ත සංවේදකය මත තබා අල්ලාගෙන සිටින්න, අනතුරුව අනෙක් පැත්තට මාරු කරන්න"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"නිදන කාල ප්‍රකාරය ක්‍රියාත්මක නිසා ලබා ගත නොහැක"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"තිර සුරැකුම භාවිත කරන්න"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"ආරෝපණය හෝ ඩොක් කර ඇති විට"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ඈදා ආරෝපණය වන අතරේ"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"ආරෝපණය වන අතරතුර"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ඩොක් කර ඇති විට"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"කවදාවත් නෑ"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"ඉතිහාස විස්තර"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"බැටරි භාවිතය"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"පසුගිය පැය 24 සඳහා භාවිතය බලන්න"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"අවසන් පූර්ණ ආරෝපණයේ සිට භාවිතය බලන්න"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"අවසන් සම්පූර්ණ ආරෝපණයේ සිට භාවිතය බලන්න"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"යෙදුම් බැටරි භාවිතය"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"විස්තර භාවිත කරන්න"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"බල භාවිතය සීරුමාරු කරන්න"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"බැටරි භාවිතය"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"පූර්ණ ආරෝපණය සිට"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"බැටරි භාවිතය කළමනාකරණය"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"මුළු <xliff:g id="TIME_0">^1</xliff:g> • අවසන් පූර්ණ ආරෝපණයේ සිට\n<xliff:g id="TIME_1">^2</xliff:g>ක පසුබිම"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"මුළු වශයෙන් <xliff:g id="TIME_0">^1</xliff:g> • අවසන් පූර්ණ ආරෝපණයේ පටන්\n<xliff:g id="TIME_1">^2</xliff:g> පසුබිම"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"මුළු <xliff:g id="TIME_0">^1</xliff:g> • පසුගිය පැය 24 සඳහා <xliff:g id="TIME_1">^2</xliff:g>\nක පසුබිම"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"මුළු <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> සඳහා <xliff:g id="TIME_1">^2</xliff:g>\nක පසුබිම"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"අවසන් පූර්ණ ආරෝපණයේ සිට මිනිත්තුවකට වඩා අඩු එකතුව"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"අවසන් පූර්ණ ආරෝපණයේ පටන් මිනිත්තුවකට වඩා අඩු එකතුව"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"පසුගිය පැය 24 සඳහා මිනිත්තුවකට වඩා අඩු එකතුව"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> සඳහා මිනිත්තුවකට වඩා අඩු එකතුව"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"අවසන් පූර්ණ ආරෝපණයේ සිට මිනිත්තුවකට වඩා අඩු පසුබිම"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"අවසන් පූර්ණ ආරෝපණයේ පටන් මිනිත්තුවකට වඩා අඩු පසුබිම"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"පසුගිය පැය 24 සඳහා මිනිත්තුවකට වඩා අඩු පසුබිම"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> සඳහා මිනිත්තුවකට වඩා අඩු පසුබිම"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"අවසන් පූර්ණ ආරෝපණයේ සිට මුළු <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"අවසන් පූර්ණ ආරෝපණයේ පටන් මුළු වශයෙන් <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"පසුගිය පැය 24 සඳහා මුළු <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> සඳහා එකතුව <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව <xliff:g id="TIME">^1</xliff:g> පසුබිම"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"අවසන් පූර්ණ ආරෝපණයේ පටන් <xliff:g id="TIME">^1</xliff:g> පසුබිම"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"පසුගිය පැය 24 සඳහා <xliff:g id="TIME">^1</xliff:g> පසුබිම"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> සඳහා <xliff:g id="TIME_0">^1</xliff:g> පසුබිම"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"මුළු <xliff:g id="TIME">^1</xliff:g> • අවසන් පූර්ණ ආරෝපණයේ සිට\nමිනිත්තුවකට වඩා අඩු පසුබිම"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"මුළු වශයෙන් <xliff:g id="TIME">^1</xliff:g> • අවසන් සම්පූර්ණ ආරෝපණයේ\nපටන් මිනිත්තුවකට අඩු පසුබිම"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"මුළු <xliff:g id="TIME">^1</xliff:g> • පසුගිය පැය 24 සඳහා\nමිනිත්තුවකට වඩා අඩු පසුබිම"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"මුළු <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> සඳහා\nමිනිත්තුවකට වඩා අඩු පසුබිම"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"අවසන් පූර්ණ ආරෝපණයේ සිට භාවිත කර නැත"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"අවසන් සම්පූර්ණ ආරෝපණයෙන් පසු භාවිතයක් නැත"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"පසුගිය පැය 24 සඳහා භාවිතයක් නැත"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"වෙනත් පරිශීලකයින්"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"මෙම උපාංගයෙන් <xliff:g id="USER_NAME">%1$s</xliff:g> මකන්න"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"අගුලු තිර සැකසීම්"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"අගුලු තිරයෙන් පරිශීලකයන් එක් කරන්න"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ඈඳූ වූ විට පරිපාලක පරිශීලක වෙත මාරු වන්න"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ඔබව මකන්නද?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"මෙම පරිශීලකයා මකන්නද?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"මෙම පැතිකඩ ඉවත් කරන්නද?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ඔබගේ ඉල්ලීම මත, Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් ප්‍රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් සමූහය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"මෙම යෙදුම දැනුම්දීම් යවන්නේ නැත"</string>
     <string name="notification_channels" msgid="1502969522886493799">"ප්‍රවර්ග"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"වෙනත්"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 9ce6e5a..e671d47 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nikdy"</item>
-    <item msgid="5065465585332446709">"Po 1 minúte"</item>
-    <item msgid="622807566366131941">"Po 5 minútach"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d2663f9..4ba315e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -602,10 +602,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Odtlačok prsta bol pridaný"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Teraz môžete odomykať tablet alebo overovať svoju totožnosť odtlačkom prsta, napríklad pri prihlasovaní do aplikácií alebo schvaľovaní nákupov"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Teraz môžete odomykať tablet alebo overovať svoju totožnosť odtlačkom prsta, napríklad pri prihlasovaní do aplikácií"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Teraz môžete odomykať zariadenie alebo overovať svoju totožnosť odtlačkom prsta, napríklad pri prihlasovaní do aplikácií"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Teraz môžete odomykať telefón alebo overovať svoju totožnosť odtlačkom prsta, napríklad pri prihlasovaní do aplikácií"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Odomykať, iba keď je obrazovka zapnutá"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ak chcete obrazovku odomknúť odtlačkom prsta, musí byť najprv zapnutá. Zníži sa tým pravdepodobnosť náhodného odomknutia."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Obrazovka, odomknutie"</string>
@@ -2877,7 +2879,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Podrobnosti histórie"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Spotreba batérie"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Zobraziť spotrebu za posledných 24 h"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Využitie od posledného úplného dobitia"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Zobraziť využ. od posl. úplného dobitia"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Spotreba batérie aplikáciami"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Využitie"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Upraviť spotrebu energie"</string>
@@ -3072,25 +3074,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Spotreba batérie"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od úplného dobitia"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Správa spotreby batérie"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Celkove: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> na pozadí\nod posledného úplného dobitia"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> celkove • <xliff:g id="TIME_1">^2</xliff:g> na pozadí\nod posledného úplného dobitia"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Celkove: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> na pozadí\nza posledných 24 h"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Celkove <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> na pozadí \nza <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Celkove menej ako minútu od posledného úplného dobitia"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Celkove menej ako minútu od posledného úplného dobitia"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Celkove menej ako minútu za posledných 24 hodín"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Celkove menej ako minútu za <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Na pozadí menej ako minútu od posledného úplného dobitia"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Na pozadí menej ako minútu od posledného úplného dobitia"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Na pozadí menej ako minútu za posledných 24 hodín"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Na pozadí menej ako minútu za <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Celkove <xliff:g id="TIME">^1</xliff:g> od posledného úplného dobitia"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> celkove od posledného úplného dobitia"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Celkove <xliff:g id="TIME">^1</xliff:g> za posledných 24 hodín"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Celkove <xliff:g id="TIME_0">^1</xliff:g> za <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> na pozadí od posledného úplného dobitia"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> na pozadí od posledného úplného dobitia"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> na pozadí za posledných 24 hodín"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> na pozadí za <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Celkove <xliff:g id="TIME">^1</xliff:g> • Na pozadí menej ako minútu\nod posledného úplného dobitia"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> celkove • na pozadí menej ako minútu\nod posledného úplného dobitia"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Celkove <xliff:g id="TIME">^1</xliff:g> • Na pozadí menej ako minútu\nza posledných 24 hodín"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Celkove <xliff:g id="TIME_0">^1</xliff:g> • Na pozadí menej ako minútu \npočas <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Žiadne použitie od posledného úplného dobitia"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Bez použitia od posledného úplného dobitia"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Žiadne použitie za posledných 24 hodín"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Ďalší používatelia"</string>
@@ -3578,7 +3580,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Odstrániť zo zariadenia (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Nastavenia uzamknutej obrazovky"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Pridávať používateľov z uzamknutej obrazovky"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"V doku prepnúť na používateľa s oprávnen. správcu"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Chcete odstrániť svoj profil?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Chcete odstrániť používateľa?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Odstrániť tento profil?"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index ca80126..f101e38 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Nikoli"</item>
-    <item msgid="5065465585332446709">"Po 1 minuti"</item>
-    <item msgid="622807566366131941">"Po 5 minutah"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b07d9a0..da55634 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Model obraza bo trajno in varno izbrisan.\n\nPo izbrisu boste za odklepanje telefona morali uporabiti kodo PIN, vzorec ali geslo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Za odklepanje telefona uporabite obraz"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Prstni odtis"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Pri uporabi odklepanja s prstnim odtisom"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Prstni odtis za službo"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Upravlj. prst. odtisov"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Upor. prst. odtisa za"</string>
@@ -603,16 +602,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Prstni odtis je dodan"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Zdaj lahko s prstnim odtisom odklenete tablični računalnik ali potrdite svojo identiteto, na primer ob prijavi v aplikacije ali odobritvi nakupa."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Zdaj lahko s prstnim odtisom odklenete tablični računalnik ali potrdite svojo identiteto, na primer ob prijavi v aplikacije."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Zdaj lahko s prstnim odtisom odklenete napravo ali potrdite svojo identiteto, na primer ob prijavi v aplikacije."</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Zdaj lahko s prstnim odtisom odklenete telefon ali potrdite svojo identiteto, na primer ob prijavi v aplikacije."</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Odklepanje samo pri vklopljenem zaslonu"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Zaslon mora biti vklopljen, preden lahko odklenete s prstnim odtisom. Tako zmanjšate verjetnost nenamernega odklepanja."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Zaslon, odklepanje"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Pozneje"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Dvignite in se spet dotaknite"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Stranski del prstnega odtisa položite na tipalo prstnih odtisov in ga pridržite, nato zamenjajte stran."</string>
@@ -2881,7 +2879,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Podrobnosti zgodovine"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Poraba energije baterije"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Ogled porabe za zadnjih 24 ur"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Ogled porabe od zadnje polne napolnjenosti"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Ogled uporabe od zadnje polne napolnjenosti"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Poraba energije baterije za aplikacijo"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Podrobnosti uporabe"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Prilagodi porabo energije"</string>
@@ -3076,25 +3074,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Poraba baterije"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Od polne napolnjenosti baterije"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Upravljanje porabe baterije"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> v ozadju\nod zadnje polne napolnjenosti"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> v ozadju\nod zadnje polne napolnjenosti"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> v ozadju\nv zadnjih 24 urah"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> v ozadju\nv časovnem obdobju <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Skupaj manj kot minuto od zadnje polne napolnjenosti"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Skupaj manj kot minuto od zadnje polne napolnjenosti"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Skupaj manj kot minuto v zadnjih 24 urah"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Skupaj manj kot minuto v časovnem obdobju <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Manj kot minuto v ozadju od zadnje polne napolnjenosti"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Manj kot minuto v ozadju od zadnje polne napolnjenosti"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Manj kot minuto v ozadju v zadnjih 24 urah"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Manj kot minuto v ozadju v časovnem obdobju <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Skupaj: <xliff:g id="TIME">^1</xliff:g> od zadnje polne napolnjenosti"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Skupaj: <xliff:g id="TIME">^1</xliff:g> od zadnje polne napolnjenosti"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Skupaj: <xliff:g id="TIME">^1</xliff:g> v zadnjih 24 urah"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g> v časovnem obdobju <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> v ozadju od zadnje polne napolnjenosti"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> v ozadju od zadnje polne napolnjenosti"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> v ozadju v zadnjih 24 urah"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> v ozadju v časovnem obdobju <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Skupaj: <xliff:g id="TIME">^1</xliff:g> • Manj kot minuto v ozadju\nod zadnje polne napolnjenosti"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Skupaj: <xliff:g id="TIME">^1</xliff:g> • Manj kot minuto v ozadju\nod zadnje polne napolnjenosti"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Skupaj: <xliff:g id="TIME">^1</xliff:g> • Manj kot minuto v ozadju\nv zadnjih 24 urah"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Skupaj: <xliff:g id="TIME_0">^1</xliff:g> • Manj kot minuto v ozadju\nv časovnem obdobju <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Ni bilo uporabe od zadnje polne napolnjenosti."</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Brez uporabe od zadnje polne napolnjenosti"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Ni bilo uporabe v zadnjih 24 urah."</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Drugi uporabniki"</string>
@@ -3582,7 +3580,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Izbris up. <xliff:g id="USER_NAME">%1$s</xliff:g> iz napr."</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Nastavitve zaklepanja zaslona"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Dodajanje uporabnikov na zaklenjenem zaslonu"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Preklopi na skrbniškega uporabnika ob namestitvi na nosilec"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Želite izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Želite izbrisati uporabnika?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Odstranitev profila?"</string>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 7c6c262..95ae5c2 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Asnjëherë"</item>
-    <item msgid="5065465585332446709">"Pas 1 minute"</item>
-    <item msgid="622807566366131941">"Pas 5 minutash"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 5bb8c8e..e1f040b 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Modeli yt i fytyrës do të fshihet përgjithmonë dhe në mënyrë të sigurt.\n\nPas fshirjes, do të të duhet kodi yt PIN, motivi ose fjalëkalimi për të shkyçur telefonin."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Përdor \"Shkyçjen me fytyrë\" për të shkyçur telefonin tënd"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Gjurma e gishtit"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Kur përdoret \"Shkyçja me gjurmën e gishtit\""</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Gjurmë gishti për punë"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Menaxho gjurm. gishtit"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Përdor gjurmën për"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Regjistruar <xliff:g id="PERCENTAGE">%d</xliff:g> për qind"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Regjistrimi i gjurmës së gishtit: <xliff:g id="PERCENTAGE">%d</xliff:g> për qind"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gjurma e gishtit u shtua"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Tani mund të përdorësh gjurmën tënde të gishtit për të shkyçur tabletin ose për të verifikuar që je ti, p.sh. kur identifikohesh në aplikacione ose kur miraton një blerje"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Tani mund të përdorësh gjurmën tënde të gishtit për të shkyçur tabletin ose për të verifikuar që je ti, si p.sh. kur identifikohesh në aplikacione"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Tani mund të përdorësh gjurmën tënde të gishtit për të shkyçur pajisjen ose për të verifikuar që je ti, si p.sh. kur identifikohesh në aplikacione"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Tani mund të përdorësh gjurmën tënde të gishtit për të shkyçur telefonin ose për të verifikuar që je ti, si p.sh. kur identifikohesh në aplikacione"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Shkyç vetëm kur ekrani është i ndezur"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ekrani duhet të jetë i ndezur para se të mund ta shkyçësh me gjurmën tënde të gishtit. Kjo bën që shkyçja aksidentale të ketë më pak gjasë të ndodhë."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekrani; Shkyçja"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Bëje më vonë"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Ngrije dhe më pas prek përsëri"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Vendos anën e gjurmës së gishtit në sensor dhe mbaje, më pas kalo në anën tjetër"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Nuk ofrohet sepse modaliteti i orarit të gjumit është aktiv"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Përdor mbrojtësin e ekranit"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Gjatë karikimit ose lidhjes me stacionin"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Teksa është në stacion e në karikim"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Gjatë karikimit"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Kur vendoset në stacion"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Asnjëherë"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detajet e historikut"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Përdorimi i baterisë"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Shiko përdorimin për 24 orët e fundit"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Shiko përdorimin nga karikimi i fundit i plotë"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Shiko përdorimin që nga karikimi i fundit i plotë"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Përdorimi i baterisë për aplikacionet"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Përdor detajet"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Rregullo përdorimin e energjisë"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Përdorimi i baterisë"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Që nga karikimi i plotë"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Menaxho përdorimin e baterisë"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> në total • <xliff:g id="TIME_1">^2</xliff:g> në sfond\nnga karikimi i fundit i plotë"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> në total • <xliff:g id="TIME_1">^2</xliff:g> në sfond\nqë nga karikimi i fundit i plotë"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> në total • <xliff:g id="TIME_1">^2</xliff:g> në sfond\npër 24 orët e fundit"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> në total • <xliff:g id="TIME_1">^2</xliff:g> në sfond\npër <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Në total më pak se një minutë nga karikimi i fundit i plotë"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Në total më pak se një minutë që nga karikimi i fundit i plotë"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Përdorimi në total: më pak se një minutë për 24 orët e fundit"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Përdorimi në total: më pak se një minutë për periudhën <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Në sfond më pak se një minutë nga karikimi i fundit i plotë"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Në sfond më pak se një minutë që nga karikimi i fundit i plotë"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Në sfond për më pak se një minutë për 24 orët e fundit"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Në sfond për më pak se një minutë për periudhën <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> në total nga karikimi i fundit i plotë"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> në total që nga karikimi i fundit i plotë"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> në total për 24 orët e fundit"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> në total për periudhën <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> në sfond nga karikimi i fundit i plotë"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> në sfond që nga karikimi i fundit i plotë"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> në sfond për 24 orët e fundit"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> në sfond për periudhën <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> në total • në sfond më pak se një minutë\nnga karikimi i fundit i plotë"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> në total • në sfond më pak se një minutë\nqë nga karikimi i fundit i plotë"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> në total • në sfond më pak se një minutë\npër 24 orët e fundit"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> në total • në sfond për më pak se një minutë\npër <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Pa përdorim nga karikimi i fundit i plotë"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Pa përdorim që nga karikimi i fundit i plotë"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Nuk është përdorur për 24 orët e fundit"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Përdorues të tjerë"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Fshije <xliff:g id="USER_NAME">%1$s</xliff:g> nga pajisja"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Cilësimet e ekranit të kyçjes"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Shto përdoruesit nga ekrani i kyçjes"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Kalo te përdoruesi administrator kur stacionohet"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Do e fshish veten?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Të fshihet ky përdorues?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Të hiqet ky profil?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Me kërkesën tënde, Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Me kërkesën tënde, Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Me kërkesën tënde, Android po bllokon shfaqjen e këtij grupi njoftimesh në këtë pajisje"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Ky aplikacion nuk dërgon njoftime"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategoritë"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Të tjera"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 019e8a6..498a447 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Никад"</item>
-    <item msgid="5065465585332446709">"После 1 минута"</item>
-    <item msgid="622807566366131941">"После 5 минута"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index de6a920..7532b2a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -456,8 +456,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Модел лица ће бити трајно и безбедно избрисан.\n\nПосле брисања вам треба PIN, шаблон или лозинка да бисте откључали телефон."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Откључајте телефон лицем"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Отисак прста"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Када се користи откључавање отиском прста"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Отисак прста за посао"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Управљај отис. прстију"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Користи отис. прста за"</string>
@@ -593,16 +592,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Регистровано је <xliff:g id="PERCENTAGE">%d</xliff:g> посто"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Регистровање отиска прста је на <xliff:g id="PERCENTAGE">%d</xliff:g> посто"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отисак прста је додат"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Сада можете да користите отисак прста за откључавање таблета или потврду идентитета, на пример, кад се пријављујете у апликације или одобравате куповину"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Сада можете да користите отисак прста за откључавање таблета или потврду идентитета, на пример, кад се пријављујете у апликације"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Сада можете да користите отисак прста за откључавање уређаја или потврду идентитета, на пример, кад се пријављујете у апликације"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Сада можете да користите отисак прста за откључавање телефона или потврду идентитета, на пример, кад се пријављујете у апликације"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Откључавање само када је екран укључен"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Екран мора да буде укључен да бисте могли да откључате отиском прста. То смањује вероватноћу за случајно откључавање."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Екран, откључавање"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Урадићу то касније"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Подигните, па опет додирните"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Ставите једну страну прста на сензор и задржите, па ставите другу страну"</string>
@@ -2844,7 +2842,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Детаљи историје"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Потрошња батерије"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Погледајте коришћења у последња 24 сата"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Коришћење од последњег потпуног пуњења"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Прегледајте употребу од последњег пуњења"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Потрошња батерије за апликације"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Коришћење детаља"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Прилагођавање коришћења напајања"</string>
@@ -3032,25 +3030,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Потрошња батерије"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Од потпуног пуњења"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Управљање потрошњом батерије"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Укупно <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> коришћења у позадини\nод последњег потпуног пуњења"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Укупно <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> коришћења у позадини\nод последњег потпуног пуњења"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Укупно <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> коришћења у позадини\nу последња 24 сата"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Укупно <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> коришћења у позадини\nу периоду <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Укупно мање од минута од последњег потпуног пуњења"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Укупно мање од минута од последњег потпуног пуњења"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Укупно мање од минута у последња 24 сата"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Укупно мање од минута у периоду <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Мање од минута коришћења у позадини од последњег потпуног пуњења"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Мање од минута коришћења у позадини од последњег потпуног пуњења"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Мање од минута коришћења у позадини у последња 24 сата"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Мање од минута коришћења у позадини у периоду: <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Укупно <xliff:g id="TIME">^1</xliff:g> од последњег потпуног пуњења"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Укупно <xliff:g id="TIME">^1</xliff:g> од последњег потпуног пуњења"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Укупно <xliff:g id="TIME">^1</xliff:g> у последња 24 сата"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Укупно <xliff:g id="TIME_0">^1</xliff:g> у периоду <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> коришћења у позадини од последњег потпуног пуњења"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> коришћења у позадини од последњег потпуног пуњења"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> коришћења у позадини у последња 24 сата"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> коришћења у позадини у периоду: <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Укупно <xliff:g id="TIME">^1</xliff:g> • Мање од минута коришћења у позадини\nод последњег потпуног пуњења"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Укупно <xliff:g id="TIME">^1</xliff:g> • мање од минута коришћења у позадини\nод последњег потпуног пуњења"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Укупно <xliff:g id="TIME">^1</xliff:g> • Мање од минута коришћења у позадини\nу последња 24 сата"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Укупно <xliff:g id="TIME_0">^1</xliff:g> • Мање од минута коришћења у позадини\nу периоду <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Нема коришћења од последњег потпуног пуњења"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Није било коришћења од последњег потпуног пуњења"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Нема коришћења у последња 24 сата"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Остали корисници"</string>
@@ -3534,7 +3532,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Избриши <xliff:g id="USER_NAME">%1$s</xliff:g> са уређаја"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Подешавања закључаног екрана"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Додај кориснике са закључаног екрана"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Пређи на администратора на базној станици"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Желите ли да избришете себе?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Бришете овог корисника?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Уклањате овај профил?"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index b4051c5..a93791a 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Aldrig"</item>
-    <item msgid="5065465585332446709">"Efter 1 minut"</item>
-    <item msgid="622807566366131941">"Efter 5 minuter"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e20c68e..457c9c5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Ansiktsmodellen raderas permanent på ett säkert sätt.\n\nEfter borttagningen behöver du pinkod, lösenord eller mönster för att låsa upp telefonen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Lås upp telefonen med ansiktslås"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingeravtryck"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"När du använder fingeravtryckslås"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingeravtr. för jobbet"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Hantera fingeravtryck"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Använd fingeravtryck för"</string>
@@ -589,16 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> procent registrerad"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Fingeravtrycket registreras: <xliff:g id="PERCENTAGE">%d</xliff:g> procent"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeravtrycket är tillagt"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Nu kan du låsa upp surfplattan eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar eller godkänner ett köp"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Nu kan du låsa upp surfplattan eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Nu kan du låsa upp enheten eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Nu kan du låsa upp telefonen eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
-    <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="6064618417107305796">"Nu kan du låsa upp surfplattan eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar eller godkänner ett köp"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="1948980056333872057">"Nu kan du låsa upp enheten eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar eller godkänner ett köp"</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="3084541878035403475">"Nu kan du låsa upp telefonen eller verifiera din identitet med ditt fingeravtryck, till exempel när du loggar in i appar eller godkänner ett köp"</string>
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Lås endast upp när skärmen är på"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Skärmen måste vara på innan du kan låsa upp med ditt fingeravtryck. Detta minskar risken för att du råkar låsa upp telefonen oavsiktligt."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skärm, lås upp"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gör det senare"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Lyft och tryck sedan igen"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Placera sidan av fingerspetsen på sensorn, håll kvar och byt sedan till andra sidan"</string>
@@ -1523,8 +1518,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Inte tillgängligt eftersom läggdagsläget är på"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Använd skärmsläckare"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Vid laddning eller dockning"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Vid laddning när den är dockad"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Vid laddning"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Vid dockning"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Aldrig"</string>
@@ -2814,7 +2808,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detaljerad historik"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batteriförbrukning"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Se användning de senaste 24 timmarna"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Se användning sedan senaste fulladdning"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Användning sedan senaste fulladdningen"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Batteriförbrukning för appen"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Information om användning"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Justera strömförbrukningen"</string>
@@ -2995,25 +2989,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Batteriförbrukning"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Sedan fulladdning"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Hantera batterianvändning"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> sammanlagt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunden\nsedan batteriet senast var fulladdat"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> totalt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunden\nsedan senaste fulladdningen"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> sammanlagt • <xliff:g id="TIME_1">^2</xliff:g> i bakgrunden\nunder de senaste 24 timmarna"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> totalt • <xliff:g id="TIME_1">^2</xliff:g> bakgrundsanvändning\nunder perioden <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Mindre än en minut sammanlagt sedan batteriet senast var fulladdat"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Mindre än en minut totalt sedan senaste fulladdningen"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Mindre än en minut sammanlagt under de senaste 24 timmarna"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Mindre än en minuts användning totalt under perioden <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Mindre än en minut i bakgrunden sedan batteriet senast var fulladdat"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Mindre än en minut i bakgrunden sedan senaste fulladdningen"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Mindre än en minut i bakgrunden under de senaste 24 timmarna"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Mindre än en minuts bakgrundsanvändning under perioden <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> sammanlagt sedan batteriet senast var fulladdat"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> totalt sedan senaste fulladdningen"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> sammanlagt under de senaste 24 timmarna"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> totalt under perioden <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> i bakgrunden sedan batteriet senast var fulladdat"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> i bakgrunden sedan senaste fulladdningen"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> i bakgrunden under de senaste 24 timmarna"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> bakgrundsanvändning under perioden <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> sammanlagt • mindre än en minut i bakgrunden\nsedan batteriet senast var fulladdat"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> totalt • mindre än en minut i bakgrunden\nsenast senaste fulladdningen"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> sammanlagt • mindre än 1 min i bakgrunden\nde senaste 24 h"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> totalt • Mindre än en minuts bakgrundsanvändning\nunder perioden <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Har inte använts sedan batteriet senast var fulladdat"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Ingen användning sedan senaste fulladdningen"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Har inte använts under de senaste 24 timmarna"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Andra användare"</string>
@@ -3493,7 +3487,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Ta bort <xliff:g id="USER_NAME">%1$s</xliff:g> från enheten"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Inställningar för låsskärm"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Lägg till användare från låsskärmen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Byt till administratörsanvändare vid dockning"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Vill du ta bort dig själv?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ska användaren raderas?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Vill du ta bort profilen?"</string>
@@ -4206,8 +4201,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"På din begäran blockeras appens aviseringar av Android och visas inte på enheten"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"På din begäran blockeras denna aviseringskategori av Android och visas inte på enheten"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"På din begäran blockeras denna aviseringsgrupp av Android och visas inte på enheten"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Den här appen skickar inga aviseringar"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategorier"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Övrigt"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index e3434d0..dfaa698 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Kamwe"</item>
-    <item msgid="5065465585332446709">"Baada ya dakika moja"</item>
-    <item msgid="622807566366131941">"Baada ya dakika tano"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7f15093..50d1777 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Muundo wa uso wako utafutwa kabisa kwa njia salama.\n\nBaada ya kufuta, utahitaji PIN, mchoro au nenosiri lako ili ufungue simu yako."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Tumia kipengele cha Kufungua kwa uso ili ufungue simu yako"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Alama ya kidole"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Unapotumia kipengele cha Kufungua kwa alama ya kidole"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Alama ya kidole kwenye wasifu wa kazini"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Dhibiti vitambulisho"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Tumia alama ya kidole kwa"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Imeandikishwa kwa asilimia <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Imeandikisha asilimia <xliff:g id="PERCENTAGE">%d</xliff:g> ya alama ya kidole"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Alama ya kidole imeongezwa"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Sasa unaweza kutumia alama ya kidole chako kufungua kompyuta kibao yako au kuthibitisha kuwa ni wewe, kama vile unapoingia katika akaunti kwenye programu au unapoidhinisha ununuzi"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Sasa unaweza kutumia alama ya kidole chako kufungua kompyuta kibao yako au kuthibitisha kuwa ni wewe, kama vile unapoingia katika akaunti kwenye programu"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Sasa unaweza kutumia alama ya kidole chako kufungua kifaa chako au kuthibitisha kuwa ni wewe, kama vile unapoingia katika akaunti kwenye programu"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Sasa unaweza kutumia alama ya kidole chako kufungua simu yako au kuthibitisha kuwa ni wewe, kama vile unapoingia katika akaunti kwenye programu"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Fungua tu skrini inapowashwa"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Ni lazima skrini iwashwe kabla uweze kufungua kwa kutumia alama yako ya kidole. Hali hii hupunguza uwezekano wa kufungua kwa bahati mbaya."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Skrini, Fungua"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Ongeza baadaye"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Inua, kisha uguse tena"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Weka upande mmoja wa kidole chako kwenye kitambuzi na ushikilie, kisha uweke upande wa pili"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Haipatikani kwa sababu umewasha hali ya wakati umelala"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Tumia taswira ya skrini"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Wakati imeunganishwa na kifaa kingine au inapochaji"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Inapounganishwa na kuchaji"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Inapochaji"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Wakati imeunganishwa na kifaa kingine"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Isiwahi"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Maelezo ya historia"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Matumizi ya betri"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Angalia matumizi katika saa 24 zilizopita"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Angalia matumizi tangu mwisho ilipojazwa chaji"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Angalia data ya matumizi tangu ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Matumizi ya betri ya programu"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Tumia maelezo"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Rekebisha utumiaji wa nishati"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Matumizi ya betri"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Tangu ilipojaa chaji"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Dhibiti matumizi ya betri"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Jumla ya <xliff:g id="TIME_0">^1</xliff:g> • Imetumika chinichini\nkwa <xliff:g id="TIME_1">^2</xliff:g>tangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Jumla ya saa <xliff:g id="TIME_0">^1</xliff:g> • Imetumika chinichini kwa <xliff:g id="TIME_1">^2</xliff:g>\ntangu ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Jumla ya <xliff:g id="TIME_0">^1</xliff:g> • Imetumika chinichini\n kwa <xliff:g id="TIME_1">^2</xliff:g> katika saa 24 zilizopita"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Jumla ya <xliff:g id="TIME_0">^1</xliff:g> • Imetumika chinichini\n kwa <xliff:g id="TIME_1">^2</xliff:g> katika <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Jumla ya muda usiozidi dakika moja tangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Imetumika kwa jumla ya muda usiozidi dakika moja tangu ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Jumla ya muda usiozidi dakika moja katika saa 24 zilizopita"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Jumla ya muda usiozidi dakika moja katika <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Imetumika chinichini kwa muda usiozidi dakika moja tangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Imetumika chinichini kwa muda usiozidi dakika moja tangu ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Imetumika chinichini kwa muda usiozidi dakika moja katika saa 24 zilizopita"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Imetumika chinichini kwa muda usiozidi dakika moja kati ya <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Jumla ya <xliff:g id="TIME">^1</xliff:g> imetumiwa tangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Imetumika kwa jumla ya <xliff:g id="TIME">^1</xliff:g> tangu ilipojaa cha mara ya mwisho"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Jumla ya <xliff:g id="TIME">^1</xliff:g> katika saa 24 zilizopita"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Jumla ya <xliff:g id="TIME_0">^1</xliff:g> katika <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Imetumika chinichini kwa <xliff:g id="TIME">^1</xliff:g> tangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Imetumika chinichini kwa <xliff:g id="TIME">^1</xliff:g> tangu ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Imetumika chinichini kwa <xliff:g id="TIME">^1</xliff:g> katika saa 24 zilizopita"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"Imetumika chinichini kwa <xliff:g id="TIME_0">^1</xliff:g> katika <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Jumla ya <xliff:g id="TIME">^1</xliff:g> • Imetumika chinichini kwa muda usiozidi dakika moja\ntangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Jumla ya <xliff:g id="TIME">^1</xliff:g> • imetumika chinichini kwa muda usiozidi dakika moja\ntangu ilipojaa chaji mara ya mwisho"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Jumla ya <xliff:g id="TIME">^1</xliff:g> • Imetumika chinichini kwa muda usiozidi dakika moja\nkatika saa 24 zilizopita"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Jumla ya <xliff:g id="TIME_0">^1</xliff:g> • Imetumika chinichini kwa muda usiozidi dakika moja\nkatika <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Haijatumika tangu ilipojazwa chaji mara ya mwisho"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Haijatumika tangu mara ya mwisho ilipojaa chaji"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Haijatumika katika saa 24 zilizopita"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Watumiaji wengine"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Futa <xliff:g id="USER_NAME">%1$s</xliff:g> kutoka kwenye kifaa hiki"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Mipangilio ya kufunga skrini"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Ongeza watumiaji skrini ikiwa imefungwa"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Rudisha kwa mtumiaji msimamizi wakati kimeambatishwa"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Ungependa kujifuta?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Ungependa kumfuta mtumiaji huyu?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Ungependa kuondoa wasifu?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Kutokana na ombi lako, Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Kutokana na ombi lako, Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Kutokana na ombi lako, Android inazuia kikundi hiki cha arifa ili zisionekane kwenye kifaa hiki"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Programu hii haitumi arifa"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Aina"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Nyingine"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -5884,7 +5881,7 @@
     <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"Onyesha vitu kama vile, muda, hali ya hewa au taarifa zingine kwenye taswira ya skrini"</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"Mipangilio zaidi"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"Chagua taswira ya skrini yako"</string>
-    <string name="dream_setup_description" msgid="7508547154038580296">"Chagua utakachokiona kwenye skrini yako wakati kompyuta kibao yako itakapokuwa imeambatishwa. Kifaa chako kinaweza kutumia nishati nyingi zaidi pale taswira ya skrini inapotumika."</string>
+    <string name="dream_setup_description" msgid="7508547154038580296">"Chagua utakachokiona kwenye skrini wakati kompyuta kibao yako imeshikiliwa kwenye kiweko. Kifaa chako kinaweza kutumia nishati nyingi zaidi taswira ya skrini inapotumika."</string>
     <string name="customize_button_title" msgid="1110284655990203359">"Badilisha upendavyo"</string>
     <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Itahitaji kuwashwa tena ili kuruhusu uwezo wa muundo huru."</string>
     <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Itahitaji kuwashwa tena ili kuwezesha hali ya kompyuta ya mezani kwenye skrini nyingine."</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 3370d57..368e69c 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ஒருபோதுமில்லை"</item>
-    <item msgid="5065465585332446709">"1 நிமிடத்திற்குப் பிறகு"</item>
-    <item msgid="622807566366131941">"5 நிமிடங்களுக்குப் பிறகு"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index e584653..3e0c8f5 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"உங்கள் முகத் தோற்றப் பதிவு நிரந்தரமாகவும் பாதுகாப்பாகவும் நீக்கப்படும்.\n\nஅவ்வாறு நீக்கப்பட்ட பிறகு மொபைலை அன்லாக் செய்வதற்கு உங்கள் பின், பேட்டர்ன் அல்லது கடவுச்சொல்லைப் பயன்படுத்த வேண்டும்."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"உங்கள் மொபைலை அன்லாக் செய்ய, \'முகம் காட்டித் திறத்தல்\' அம்சத்தைப் பயன்படுத்தலாம்"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"கைரேகை"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"கைரேகை அன்லாக் அம்சத்தைப் பயன்படுத்தும்போது"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"பணிக்கான கைரேகை"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"கைரேகைகளை நிர்வகிக்கவும்"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"இதற்குப் பயன்படுத்து:"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> சதவீதம் பதிவுசெய்யப்பட்டுள்ளது"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"கைரேகை <xliff:g id="PERCENTAGE">%d</xliff:g> சதவீதம் பதிவுசெய்யப்பட்டது"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"கைரேகை சேர்க்கப்பட்டது"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"இப்போது உங்கள் கைரேகையைப் பயன்படுத்தி டேப்லெட்டை அன்லாக் செய்யலாம் அல்லது ஆப்ஸில் உள்நுழைதல், பர்ச்சேஸை அங்கீகரித்தல் போன்ற செயல்பாடுகளின்போது அது நீங்கள்தான் என்பதை உறுதிப்படுத்தலாம்"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"உங்கள் டேப்லெட்டை அன்லாக் செய்வதற்கோ ஆப்ஸில் உள்நுழையும்போது அது நீங்கள்தான் என்பதை உறுதிப்படுத்துவதற்கோ இப்போது உங்கள் கைரேகையைப் பயன்படுத்தலாம்"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"உங்கள் சாதனத்தை அன்லாக் செய்வதற்கோ ஆப்ஸில் உள்நுழையும்போது அது நீங்கள்தான் என்பதை உறுதிப்படுத்துவதற்கோ இப்போது உங்கள் கைரேகையைப் பயன்படுத்தலாம்"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"உங்கள் மொபைலை அன்லாக் செய்வதற்கோ ஆப்ஸில் உள்நுழையும்போது அது நீங்கள்தான் என்பதை உறுதிப்படுத்துவதற்கோ இப்போது உங்கள் கைரேகையைப் பயன்படுத்தலாம்"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"திரை இயக்கத்தில் இருக்கும்போது மட்டும் அன்லாக் செய்தல்"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"உங்கள் கைரேகை மூலம் அன்லாக் செய்யும் முன்பு திரை இயக்கத்தில் இருக்க வேண்டும். இது தற்செயலாக அன்லாக் செய்யப்படுவதைக் குறைக்கும்."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"திரையை அன்லாக் செய்யும்"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"இப்போது வேண்டாம்"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"விரலை எடுத்துவிட்டு, மீண்டும் தொடவும்"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"உங்கள் விரலின் விளிம்புப் பகுதியை சென்சாரின் ஒரு பக்கத்தில் வைத்துப் பிடித்திருந்து, பிறகு மற்றொரு பக்கத்திற்கு மாற்றவும்"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"உறக்கநேரப் பயன்முறை ஆனில் உள்ளதால் கிடைக்காது"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"ஸ்கிரீன் சேவரை உபயோகித்தல்"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"இரண்டின் போதும்"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"டாக் மற்றும் சார்ஜிங்கின்போது"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"சார்ஜ் செய்யப்படும்போது"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"சாதனத்தில் இணைந்திருக்கும்போது"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"ஒருபோதும் வேண்டாம்"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"வரலாறு விவரங்கள்"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"பேட்டரி உபயோகம்"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"கடந்த 24 மணிநேர உபயோகத்தைக் காட்டும்"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"கடைசியாக முழு சார்ஜ் செய்ததிலிருந்து உபயோகத்தைக் காட்டும்"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"உபயோகம் (கடைசி முழு சார்ஜிலிருந்து)"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ஆப்ஸின் பேட்டரி உபயோகம்"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"விவரங்களைப் பயன்படுத்து"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ஆற்றல் பயன்பாட்டைச் சரிசெய்க"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"பேட்டரி உபயோகம்"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"முழு சார்ஜ் ஆனதிலிருந்து"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"பேட்டரி பயன்பாட்டை நிர்வகி"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"மொத்தம்: <xliff:g id="TIME_0">^1</xliff:g> • கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து\nபின்னணி உபயோகம்: <xliff:g id="TIME_1">^2</xliff:g>"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"மொத்தம்: <xliff:g id="TIME_0">^1</xliff:g> • கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து\nபின்னணி உபயோகம்: <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"மொத்தம்: <xliff:g id="TIME_0">^1</xliff:g> • கடந்த 24 மணிநேரத்தில்\nபின்னணி உபயோகம்: <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"மொத்தம் <xliff:g id="TIME_0">^1</xliff:g> • \n <xliff:g id="TIME_PERIOD">^3</xliff:g> வரை பின்னணி உபயோகம் <xliff:g id="TIME_1">^2</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து ஒரு நிமிடத்திற்கும் குறைவான மொத்த உபயோகம்"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து ஒரு நிமிடத்திற்கும் குறைவான மொத்த உபயோகம்"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"கடந்த 24 மணிநேரத்தில் ஒரு நிமிடத்திற்கும் குறைவான மொத்த உபயோகம்"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> கால அளவில் மொத்த உபயோகம் ஒரு நிமிடத்திற்கும் குறைவானது"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து ஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து ஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"கடந்த 24 மணிநேரத்தில் ஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> கால அளவில் ஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து மொத்த உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"மொத்தம்: <xliff:g id="TIME">^1</xliff:g> (கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து)"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"கடந்த 24 மணிநேரத்தில்: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> கால அளவில் மொத்த உபயோகம் <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து பின்னணி உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"பின்னணி உபயோகம்: <xliff:g id="TIME">^1</xliff:g> (கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து)"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"கடந்த 24 மணிநேரத்தில் பின்னணி உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> கால அளவில் பின்னணி உபயோகம்: <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"மொத்தம்: <xliff:g id="TIME">^1</xliff:g> • கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து\nஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"மொத்தம்: <xliff:g id="TIME">^1</xliff:g> • கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து\nஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"மொத்தம்: <xliff:g id="TIME">^1</xliff:g> • கடந்த 24 மணிநேரத்தில்\nஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"மொத்தம் <xliff:g id="TIME_0">^1</xliff:g> • \n <xliff:g id="TIME_PERIOD">^2</xliff:g> வரை ஒரு நிமிடத்திற்கும் குறைவான பின்னணி உபயோகம்"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"கடந்த முறை முழு சார்ஜ் ஆனதிலிருந்து எந்த உபயோகமும் இல்லை"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"கடைசியாக முழு சார்ஜ் செய்யப்பட்டதிலிருந்து உபயோகிக்கப்படவில்லை"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"கடந்த 24 மணிநேரத்தில் எந்த உபயோகமும் இல்லை"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"பிற பயனர்கள்"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"சாதனத்திலிருந்து <xliff:g id="USER_NAME">%1$s</xliff:g> ஐ நீக்கு"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"லாக் ஸ்கிரீன் அமைப்புகள்"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"லாக் ஸ்கிரீனிலிருந்து பயனர்களைச் சேர்"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"இணைந்திருக்கும்போது நிர்வாகப் பயனருக்கு மாறும்"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"உங்களை நீக்கவா?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"இந்தப் பயனரை நீக்கவா?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"இதை அகற்றவா?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"உங்கள் கோரிக்கையின் படி, சாதனத்தில் இந்த ஆப்ஸின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்த வகை அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"இந்த ஆப்ஸ் அறிவிப்புகளை அனுப்பாது"</string>
     <string name="notification_channels" msgid="1502969522886493799">"வகைகள்"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"மற்றவை"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
@@ -5883,7 +5880,7 @@
     <string name="dream_complications_toggle_summary" msgid="8088911054987524904">"நேரம், வானிலை, பிற தகவல்கள் போன்றவற்றை ஸ்கிரீன் சேவரில் காட்டும்"</string>
     <string name="dream_more_settings_category" msgid="3119192146760773748">"கூடுதல் அமைப்புகள்"</string>
     <string name="dream_setup_title" msgid="2458303874255396142">"உங்கள் ஸ்கிரீன் சேவரைத் தேர்வுசெய்யுங்கள்"</string>
-    <string name="dream_setup_description" msgid="7508547154038580296">"உங்கள் டேப்லெட் டாக் செய்யப்பட்டிருக்கும்போது திரையில் என்ன காட்டப்பட வேண்டும் என்பதைத் தேர்வுசெய்யவும். ஸ்கிரீன் சேவரைப் பயன்படுத்தும்போது உங்கள் சாதனம் அதிக பேட்டரியைப் பயன்படுத்தக்கூடும்."</string>
+    <string name="dream_setup_description" msgid="7508547154038580296">"உங்கள் டேப்லெட் டாக் செய்யப்பட்டிருக்கும்போது திரையில் என்ன காட்டப்பட வேண்டும் என்பதைத் தேர்வுசெய்யலாம். ஸ்கிரீன் சேவரைப் பயன்படுத்தும்போது உங்கள் சாதனம் அதிக பேட்டரியைப் பயன்படுத்தக்கூடும்."</string>
     <string name="customize_button_title" msgid="1110284655990203359">"தனிப்பயனாக்கு"</string>
     <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"குறிப்பிட்ட வடிவமில்லாத சாளரங்களுக்கான ஆதரவை இயக்க சாதனத்தை மீண்டும் தொடங்கவும்."</string>
     <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"இரண்டாம் நிலைத் திரையில் டெஸ்க்டாப் பயன்முறையைப் பயன்படுத்த, சாதனத்தை மீண்டும் தொடங்குதல் அவசியம்."</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 1416f95..aa5fb99 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ఎప్పుడూ వద్దు"</item>
-    <item msgid="5065465585332446709">"1 నిమిషం తర్వాత"</item>
-    <item msgid="622807566366131941">"5 నిమిషాల తర్వాత"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index fd56053..5b86cfe 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"మీ ఫేస్ మోడల్ శాశ్వతంగా మరియు సురక్షితంగా తొలగించబడుతుంది.\n\nతొలగించిన తర్వాత, మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి మీకు మీ PIN, ఆకృతి లేదా పాస్‌వర్డ్ అవసరం."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"వేలిముద్ర"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"వేలిముద్ర అన్‌లాక్ ఉపయోగిస్తున్నప్పుడు"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"ఆఫీస్ కోసం వేలిముద్ర"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"వేలిముద్రలు నిర్వహిం."</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"దీనికి వేలిముద్రను ఉప."</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"<xliff:g id="PERCENTAGE">%d</xliff:g> శాతం ఎన్‌రోల్ చేయబడింది"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"వేలిముద్ర <xliff:g id="PERCENTAGE">%d</xliff:g> శాతం ఎన్‌రోల్ అవుతోంది"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"వేలిముద్ర జోడించబడింది"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ఇప్పుడు మీరు మీ టాబ్లెట్‌ను అన్‌లాక్ చేయడానికి లేదా ఇది మీరేనని ధృవీకరించడానికి మీరు యాప్‌లకు సైన్ ఇన్ చేయడం లేదా కొనుగోలును ఆమోదించడం వంటివి చేసినప్పుడు మీ వేలిముద్రను ఉపయోగించవచ్చు"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ఇప్పుడు మీరు మీ టాబ్లెట్‌ను అన్‌లాక్ చేయడానికి లేదా మీరు యాప్‌లకు సైన్ ఇన్ చేసినప్పుడు ఇది మీరేనని వెరిఫై చేయడానికి మీ వేలిముద్రను ఉపయోగించవచ్చు"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ఇప్పుడు మీరు మీ పరికరాన్ని అన్‌లాక్ చేయడానికి లేదా మీరు యాప్‌లకు సైన్ ఇన్ చేసినప్పుడు ఇది మీరేనని వెరిఫై చేయడానికి మీ వేలిముద్రను ఉపయోగించవచ్చు"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ఇప్పుడు మీరు మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి లేదా మీరు యాప్‌లకు సైన్ ఇన్ చేసినప్పుడు ఇది మీరేనని వెరిఫై చేయడానికి మీ వేలిముద్రను ఉపయోగించవచ్చు"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"స్క్రీన్ ఆన్‌లో ఉన్నప్పుడు మాత్రమే అన్‌లాక్ చేయండి"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"మీరు మీ వేలిముద్రతో అన్‌లాక్ చేయడానికి ముందు స్క్రీన్ తప్పనిసరిగా ఆన్‌లో ఉండాలి. ఇది ప్రమాదవశాత్తూ అన్‌లాక్ అయ్యే అవకాశం తక్కువగా ఉంటుంది."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"స్క్రీన్, అన్‌లాక్"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"తర్వాత చేస్తాను"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"పైకి ఎత్తి, మళ్లీ తాకండి"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"సెన్సార్‌పై మీ వేలిముద్రలో కొంత భాగాన్ని ఒక వైపునకు నొక్కి ఉంచి, ఆపై మరొక వైపునకు మార్చండి"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"బెడ్ టైమ్ మోడ్ ఆన్‌లో ఉండడం వల్ల అందుబాటులో లేదు"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"స్క్రీన్ సేవర్‌ను ఉపయోగించండి"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"ఛార్జ్ చేసేటప్పుడు లేదా డాక్ చేసినప్పుడు"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"డాక్ అయి, ఛార్జింగ్ చేస్తున్నప్పుడు"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"ఛార్జింగ్‌లో ఉన్నప్పుడు"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"డాక్ చేయబడినప్పుడు"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"ఎప్పటికీ వద్దు"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"హిస్టరీ వివరాలు"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"బ్యాటరీ వినియోగం"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"గత 24 గంటలలో వినియోగాన్ని చూడండి"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"గత పూర్తి ఛార్జ్ నుండి వినియోగాన్ని చూడండి"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"చివరి ఫుల్ ఛార్జ్ వినియోగాన్ని చూడు"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"యాప్ బ్యాటరీ వినియోగం"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"వినియోగ వివరాలు"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"శక్తి వినియోగాన్ని సర్దుబాటు చేయండి"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"బ్యాటరీ వినియోగం"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ఫుల్‌ ఛార్జ్ చేసినప్పటి నుండి"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"బ్యాటరీ వినియోగాన్ని మేనేజ్ చేయండి"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"మొత్తం <xliff:g id="TIME_0">^1</xliff:g> • చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి\nబ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం <xliff:g id="TIME_1">^2</xliff:g> ఉంది"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> మొత్తం బ్యాక్‌గ్రౌండ్ వినియోగం • చివరి ఫుల్ ఛార్జ్ అయినప్పటి నుండి\n<xliff:g id="TIME_1">^2</xliff:g> బ్యాక్‌గ్రౌండ్ వినియోగం ఉంది"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"గత 24 గం.కు <xliff:g id="TIME_0">^1</xliff:g> మొత్తం • <xliff:g id="TIME_1">^2</xliff:g> బ్యాక్‌గ్రౌండ్\n వినియోగం"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_PERIOD">^3</xliff:g> కోసం\n<xliff:g id="TIME_0">^1</xliff:g>మొత్తం • <xliff:g id="TIME_1">^2</xliff:g> బ్యాక్‌గ్రౌండ్ వినియోగం."</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి మొత్తం నిమిషం కంటే తక్కువ ఉంది"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"చివరిగా ఫుల్ ఛార్జ్ అయినప్పటి నుండి మొత్తం ఒక నిమిషం కంటే తక్కువ వినియోగం ఉంది"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"గడిచిన 24 గంటలలో మొత్తం బ్యాటరీ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> మధ్య మొత్తం బ్యాటరీ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"చివరి ఫుల్ ఛార్జ్ నుండి బ్యాక్‌గ్రౌండ్ వినియోగ సమయం ఒక నిమిషం కంటే తక్కువ ఉంది"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"గత 24 గంటల నుండి బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> మధ్య బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి మొత్తం <xliff:g id="TIME">^1</xliff:g> ఉంది"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"చివరిగా ఫుల్ ఛార్జ్ చేసినప్పటి నుండి <xliff:g id="TIME">^1</xliff:g> మొత్తం బ్యాక్‌గ్రౌండ్ వినియోగం ఉంది"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"గత 24 గంటల నుండి మొత్తం <xliff:g id="TIME">^1</xliff:g> ఉంది"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> మధ్య మొత్తం బ్యాటరీ వినియోగం <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం <xliff:g id="TIME">^1</xliff:g> ఉంది"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"చివరిగా ఫుల్ ఛార్జ్ చేసినప్పటి నుండి <xliff:g id="TIME">^1</xliff:g> బ్యాక్‌గ్రౌండ్ వినియోగం ఉంది"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"గత 24 గంటల నుండి బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం <xliff:g id="TIME">^1</xliff:g> ఉంది"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> మధ్య బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"మొత్తం <xliff:g id="TIME">^1</xliff:g> • చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం\nనిమిషం కంటే తక్కువ ఉంది"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> మొత్తం బ్యాక్‌గ్రౌండ్ వినియోగం • చివరిగా ఫుల్ ఛార్జ్ అయినప్పటినుండి\nఒక నిమిషం కంటే తక్కువ బ్యాక్‌గ్రౌండ్ వినియోగం"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"మొత్తం <xliff:g id="TIME">^1</xliff:g> • గత 24 గం. నుండి\nబ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"మొత్తం <xliff:g id="TIME_0">^1</xliff:g> • \n<xliff:g id="TIME_PERIOD">^2</xliff:g> మధ్య బ్యాటరీ బ్యాక్‌గ్రౌండ్ వినియోగం నిమిషం కంటే తక్కువ ఉంది"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి ఎలాంటి వినియోగం లేదు"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"చివరిగా పూర్తి ఛార్జ్ చేసినప్పటి నుండి వినియోగంలో లేదు"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"గత 24 గంటల నుండి ఎలాంటి వినియోగం లేదు"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ఇతర యూజర్‌లు"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ఈ పరికరం నుండి <xliff:g id="USER_NAME">%1$s</xliff:g>ని తొలగించు"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"లాక్ స్క్రీన్ సెట్టింగ్‌లు"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"లాక్ స్క్రీన్ నుండి యూజ‌ర్‌ల‌ను జోడించండి"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"డాక్ చేసినప్పుడు అడ్మిన్ యూజర్‌కు స్విచ్ అవ్వండి"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"మిమ్మల్ని తొలగించాలా?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ఈ యూజర్‌ను తొలగించాలా?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ఈ ప్రొఫైల్‌ను తీసివేయాలా?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ గ్రూప్‌ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"ఈ యాప్ నోటిఫికేషన్‌లను పంపదు"</string>
     <string name="notification_channels" msgid="1502969522886493799">"కేటగిరీలు"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"ఇతరం"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 6e1be01..67567b0 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"ไม่เลย"</item>
-    <item msgid="5065465585332446709">"หลังจาก 1 นาที"</item>
-    <item msgid="622807566366131941">"หลังจาก 5 นาที"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1aaa2a4..e875209 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -588,10 +588,12 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"ลงทะเบียนแล้ว <xliff:g id="PERCENTAGE">%d</xliff:g> เปอร์เซ็นต์"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"กำลังลงทะเบียนลายนิ้วมือ <xliff:g id="PERCENTAGE">%d</xliff:g> เปอร์เซ็นต์"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"เพิ่มลายนิ้วมือแล้ว"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"ตอนนี้คุณใช้ลายนิ้วมือเพื่อปลดล็อกแท็บเล็ตหรือยืนยันตัวตนได้ เช่น เมื่อลงชื่อเข้าใช้แอปหรืออนุมัติการซื้อ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"ตอนนี้คุณสามารถใช้ลายนิ้วมือเพื่อปลดล็อกแท็บเล็ตหรือยืนยันว่าเป็นคุณ เช่น เมื่อลงชื่อเข้าใช้แอป"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"ตอนนี้คุณสามารถใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์หรือยืนยันว่าเป็นคุณ เช่น เมื่อลงชื่อเข้าใช้แอป"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"ตอนนี้คุณสามารถใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรือยืนยันว่าเป็นคุณ เช่น เมื่อลงชื่อเข้าใช้แอป"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"ปลดล็อกเฉพาะเวลาที่หน้าจอเปิดอยู่เท่านั้น"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"หน้าจอต้องเปิดอยู่จึงจะปลดล็อกด้วยลายนิ้วมือได้ ซึ่งจะช่วยลดการปลดล็อกโดยไม่ได้ตั้งใจ"</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"ปลดล็อกหน้าจอ"</string>
@@ -2809,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"รายละเอียดประวัติ"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"การใช้งานแบตเตอรี่"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"ดูการใช้งานใน 24 ชั่วโมงที่ผ่านมา"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"ดูการใช้งานตั้งแต่การชาร์จเต็มล่าสุด"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"ดูการใช้งานตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"การใช้งานแบตเตอรี่ของแอป"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"ใช้รายละเอียด"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"ปรับการใช้พลังงาน"</string>
@@ -2990,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"การใช้งานแบตเตอรี่"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"ตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"จัดการการใช้งานแบตเตอรี่"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ใช้งานรวม <xliff:g id="TIME_0">^1</xliff:g> • ใช้งานเบื้องหลัง <xliff:g id="TIME_1">^2</xliff:g>\nตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"ใช้งานรวม <xliff:g id="TIME_0">^1</xliff:g> • ใช้งานเบื้องหลัง <xliff:g id="TIME_1">^2</xliff:g>\nตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ใช้งานรวม <xliff:g id="TIME_0">^1</xliff:g> • ใช้งานเบื้องหลัง <xliff:g id="TIME_1">^2</xliff:g>\nในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"ใช้งานรวม <xliff:g id="TIME_0">^1</xliff:g> • ใช้งานเบื้องหลัง <xliff:g id="TIME_1">^2</xliff:g>\nในช่วง <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"ใช้งานรวมไม่ถึง 1 นาทีตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"ใช้งานรวมไม่ถึง 1 นาทีตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"ใช้งานรวมไม่ถึง 1 นาทีในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"ใช้งานรวมไม่ถึง 1 นาทีในช่วง <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"ใช้งานเบื้องหลังไม่ถึง 1 นาทีตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"ใช้งานเบื้องหลังไม่ถึง 1 นาทีตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"ใช้งานเบื้องหลังไม่ถึง 1 นาทีในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"ใช้งานเบื้องหลังไม่ถึง 1 นาทีในช่วง <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"ใช้งานรวม <xliff:g id="TIME">^1</xliff:g>ตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"ใช้งานรวม <xliff:g id="TIME">^1</xliff:g> ตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ใช้งานรวม <xliff:g id="TIME">^1</xliff:g>ในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"ใช้งานรวม <xliff:g id="TIME_0">^1</xliff:g>ในช่วง <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"ใช้งานเบื้องหลัง <xliff:g id="TIME">^1</xliff:g>ตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"ใช้งานเบื้องหลัง <xliff:g id="TIME">^1</xliff:g> ตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"ใช้งานเบื้องหลัง <xliff:g id="TIME">^1</xliff:g>ในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"ใช้งานเบื้องหลัง <xliff:g id="TIME_0">^1</xliff:g>ในช่วง <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ใช้งานรวม <xliff:g id="TIME">^1</xliff:g> • ใช้งานเบื้องหลังไม่ถึง 1 นาที\nตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"ใช้งานรวม <xliff:g id="TIME">^1</xliff:g> • ใช้งานเบื้องหลังไม่ถึง 1 นาที\nตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ใช้งานรวม <xliff:g id="TIME">^1</xliff:g> • ใช้งานเบื้องหลังไม่ถึง 1 นาที\nในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"ใช้งานรวม <xliff:g id="TIME_0">^1</xliff:g> • ใช้งานเบื้องหลังไม่ถึง 1 นาที\nในช่วง <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"ไม่มีการใช้งานตั้งแต่ชาร์จเต็มครั้งล่าสุด"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"ไม่มีการใช้งานตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"ไม่มีการใช้งานในช่วง 24 ชม. ที่ผ่านมา"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"ผู้ใช้รายอื่นๆ"</string>
@@ -3488,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"ลบ <xliff:g id="USER_NAME">%1$s</xliff:g> จากอุปกรณ์นี้"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"การตั้งค่าหน้าจอล็อก"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"เพิ่มผู้ใช้จากหน้าจอล็อก"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"เปลี่ยนเป็นผู้ใช้ที่ดูแลระบบเมื่อวางบนแท่นชาร์จ"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"ลบตัวคุณเองไหม"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ลบผู้ใช้รายนี้ใช่ไหม"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"นำโปรไฟล์นี้ออกใช่ไหม"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index c8175c6..9dd7a74 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Hindi kailanman"</item>
-    <item msgid="5065465585332446709">"Pagkalipas ng 1 minuto"</item>
-    <item msgid="622807566366131941">"Pagkalipas ng 5 minuto"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6974a49..f7900ce 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Permanente at secure na ide-delete ang iyong face model.\n\nPagkatapos ng pag-delete, kakailanganin mo ang iyong PIN, pattern, o password para i-unlock ang telepono mo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Gamitin ang Pag-unlock Gamit ang Mukha para i-unlock ang iyong telepono"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Fingerprint"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Kapag ginagamit ang Fingerprint Unlock"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Fingerprint sa trabaho"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Pamahalaan fingerprint"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Gamit fingerprint para"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Na-enroll ang <xliff:g id="PERCENTAGE">%d</xliff:g> (na) porsyento"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Pag-enroll ng fingerprint: <xliff:g id="PERCENTAGE">%d</xliff:g> porsyento"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Naidagdag na ang fingerprint"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Ngayon, magagamit mo na ang iyong fingerprint para i-unlock ang tablet mo o i-verify na ikaw ito, halimbawa, kapag nagsa-sign in ka sa mga app o nag-aapruba ng pagbili"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Ngayon, magagamit mo na ang iyong fingerprint para i-unlock ang tablet mo o i-verify na ikaw ito, halimbawa, kapag nagsa-sign in ka sa mga app"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Ngayon, magagamit mo na ang iyong fingerprint para i-unlock ang device mo o i-verify na ikaw ito, halimbawa, kapag nagsa-sign in ka sa mga app"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Ngayon, magagamit mo na ang iyong fingerprint para i-unlock ang telepono mo o i-verify na ikaw ito, halimbawa, kapag nagsa-sign in ka sa mga app"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Mag-unlock lang kapag naka-on ang screen"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Naka-on dapat ang screen bago mo magawang mag-unlock gamit ang iyong fingerprint. Binabawasan nito ang posibilidad ng aksidenteng pag-unlock."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Screen, I-unlock"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gawin ito sa ibang pagkakataon"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Iangat, pagkatpaos ay pindutin ulit"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Ilagay ang gilid ng iyong fingerprint sa sensor nang matagal, pagkatapos ay ang kabilang gilid"</string>
@@ -2813,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Detalye ng history"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Paggamit ng baterya"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Tingnan ang paggamit sa huling 24 oras"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Usage mula noong huling na-full charge"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Paggamit matapos huling ma-full charge"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Paggamit ng baterya ng app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Mga detalye ng paggamit"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Isaayos ang paggamit ng power"</string>
@@ -2994,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Paggamit ng baterya"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Mula noong napuno ang baterya"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Pamahalaan ang paggamit ng baterya"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> sa kabuuan • <xliff:g id="TIME_1">^2</xliff:g> sa background\nmula noong huling na-full charge"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> sa kabuuan • Nasa background nang <xliff:g id="TIME_1">^2</xliff:g>\nmula noong huling na-full charge"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> sa kabuuan • <xliff:g id="TIME_1">^2</xliff:g> sa background\nsa nakalipas na 24 na oras"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"<xliff:g id="TIME_0">^1</xliff:g> sa kabuuan • <xliff:g id="TIME_1">^2</xliff:g> sa background\nnoong <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Sa kabuuan, wala pang isang minuto mula noong huling na-full charge"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Sa kabuuan, wala pang isang minuto mula noong huling na-full charge"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Sa kabuuan, wala pang isang minuto sa nakalipas na 24 na oras"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Sa kabuuan, wala pang isang minuto noong <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Wala pang isang minutong nasa background mula noong huling na-full charge"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Wala pang isang minutong nasa background mula noong huling na-full charge"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Wala pang isang minutong nasa background sa nakalipas na 24 na oras"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Wala pang isang minutong nasa background noong <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> sa kabuuan mula noong huling na-full charge"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"<xliff:g id="TIME">^1</xliff:g> sa kabuuan mula noong huling na-full charge"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> sa kabuuan sa nakalipas na 24 na oras"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_0">^1</xliff:g> sa kabuuan noong <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> sa background mula noong huling na-full charge"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Nasa background nang <xliff:g id="TIME">^1</xliff:g> mula noong huling na-full charge"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> sa background sa nakalipas na 24 na oras"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> sa background noong <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> sa kabuuan • wala pang isang minutong nasa background\nmula noong huling na-full charge"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> sa kabuuan • nasa background nang wala pang isang minuto\nmula noong huling na-full charge"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> sa kabuuan • wala pang isang minutong nasa background\nsa nakalipas na 24 na oras"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"<xliff:g id="TIME_0">^1</xliff:g> sa kabuuan • wala pang isang minutong nasa background\nnoong <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Walang paggamit mula noong huling na-full charge"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Hindi ginamit mula noong huling na-full charge"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Walang paggamit sa nakalipas na 24 na oras"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Iba pang user"</string>
@@ -3492,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Tanggal <xliff:g id="USER_NAME">%1$s</xliff:g> dito device"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Mga setting ng lock screen"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Magdagdag ng mga user mula sa lock screen"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Lumipat sa admin user kapag naka-dock"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"I-delete ang iyong sarili?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"I-delete ang user na ito?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Alisin ang profile?"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 4d9dd5d..543c948 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Hiçbir zaman"</item>
-    <item msgid="5065465585332446709">"1 dakika sonra"</item>
-    <item msgid="622807566366131941">"5 dakika sonra"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6094380..f7dc563 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Yüz modeliniz güvenli bir şekilde kalıcı olarak silinir.\n\nSilme işleminden sonra, telefonunuzun kilidini açmak için PIN\'iniz, deseniniz veya şifreniz gerekir."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Telefonunuzun kilidini açmak için Yüz Tanıma Kilidi\'ni kullanın"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Parmak izi"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Parmak İzi Kilidi kullanırken"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"İş için parmak izi"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Parmak izi yönetimi"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Parmak izi kullanımı:"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Kaydolma işlemi yüzde <xliff:g id="PERCENTAGE">%d</xliff:g> tamamlandı"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Parmak izi kaydı yüzde <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Parmak izi eklendi"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Artık tabletinizin kilidini açmak veya uygulamalarda oturum açma ya da satın alma işlemlerini onaylama gibi durumlarda kimliğinizi doğrulamak için parmak izinizi kullanabilirsiniz"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Artık tabletinizin kilidini açmak veya uygulamalarda oturum açma gibi işlemlerde kimliğinizi doğrulamak için parmak izinizi kullanabilirsiniz"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Artık telefonunuzun kilidini açmak veya uygulamalarda oturum açma gibi işlemlerde kimliğinizi doğrulamak için parmak izinizi kullanabilirsiniz"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Artık telefonunuzun kilidini açmak veya uygulamalarda oturum açma gibi işlemlerde kimliğinizi doğrulamak için parmak izinizi kullanabilirsiniz"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Yalnızca ekran açıkken kilidi aç"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Parmak izinizi kullanarak kilidi açabilmeniz için önce ekranı açmanız gerekir. Bu şekilde, yanlışlıkla kilit açma ihtimali azalır."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekran kilidini açma"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Daha sonra yap"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Kaldırın, tekrar dokunun"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Parmak izinizin yan tarafını sensöre yerleştirip basılı tuttuktan sonra diğer tarafa geçin"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Uyku vakti modu açık olduğundan kullanılamıyor"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Ekran koruyucu kullan"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Şarj olurken veya yuvadayken"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Yuvada ve şarj olurken"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Şarj olurken"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Yuvadayken"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Hiçbir zaman"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Geçmiş ayrıntıları"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Pil kullanımı"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Son 24 saatteki kullanımı göster"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Son tam şarjdan bu yana kullanımı göster"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Son tam şarjdan bu yana kullanımı görün"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Uygulamaların pil kullanımı"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Kullanım ayrıntıları"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Pil kullanımını ayarla"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Pil kullanımı"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Son tam şarjdan itibaren"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Pil kullanımını yönetin"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Toplam <xliff:g id="TIME_0">^1</xliff:g> • Son kez tamamen şarj olduktan sonra\narka planda <xliff:g id="TIME_1">^2</xliff:g> kullanıldı"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Toplam <xliff:g id="TIME_0">^1</xliff:g> • Son tam şarjdan bu yana\narka planda <xliff:g id="TIME_1">^2</xliff:g> kullanıldı"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Toplam <xliff:g id="TIME_0">^1</xliff:g> • Son 24 saatte \narka planda <xliff:g id="TIME_1">^2</xliff:g> kullanıldı"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Toplam <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^3</xliff:g> arasında\narka planda <xliff:g id="TIME_1">^2</xliff:g> kullanıldı"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Son kez tamamen şarj olduktan sonra toplam bir dakikadan az"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Son kez tamamen şarj olduktan sonra toplam bir dakikadan az"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Son 24 saat içinde toplam bir dakikadan az"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> arasında toplam bir dakikadan az"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Son kez tamamen şarj olduktan sonra arka planda bir dakikadan az kullanıldı"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Son kez tamamen şarj olduktan sonra arka planda bir dakikadan az kullanıldı"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Son 24 saatte arka planda bir dakikadan az kullanıldı"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> arasında arka planda bir dakikadan az kullanıldı"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Son kez tamamen şarj olduktan sonra toplam <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Son tam şarjdan bu yana toplam <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Son 24 saatte toplam <xliff:g id="TIME">^1</xliff:g> kullanıldı"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> arasında toplam <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Son kez tamamen şarj olduktan sonra arka planda <xliff:g id="TIME">^1</xliff:g> kullanıldı"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Son tam şarjdan bu yana arka planda <xliff:g id="TIME">^1</xliff:g> kullanıldı"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"Son 24 saatte arka planda <xliff:g id="TIME">^1</xliff:g> kullanıldı"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> arasında arka planda <xliff:g id="TIME_0">^1</xliff:g> kullanıldı"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Toplam <xliff:g id="TIME">^1</xliff:g> • Son kez tamamen şarj olduktan sonra\narka planda bir dakikadan az kullanıldı"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Toplam <xliff:g id="TIME">^1</xliff:g> • Son tam şarjdan bu yana\narka planda bir dakikadan az kullanıldı"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Toplam <xliff:g id="TIME">^1</xliff:g> • Son 24 saat içinde arka planda\nbir dakikadan az kullanıldı"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Toplam <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_PERIOD">^2</xliff:g> arasında arka planda\nbir dakikadan az kullanıldı"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Son kez tamamen şarj olduktan sonra kullanılmadı"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Son tam şarjdan bu yana kullanılmadı"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Son 24 saatte kullanılmadı"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Diğer kullanıcılar"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Bu cihazdan sil: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Kilit ekranı ayarları"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Kilit ekranından kullanıcı eklensin"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Yuvaya yerleştirildiğinde yönetici kullanıcıya geç"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Kendinizi silmek istiyor musunuz?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Bu kullanıcı silinsin mi?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Bu profil kaldırılsın mı?"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"İsteğiniz üzerine Android, bu uygulamanın bildirimlerinin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"İsteğiniz üzerine Android, bu kategorideki bildirimlerin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"İsteğiniz üzerine Android, bu bildirim grubunun bu cihazda görünmesini engelliyor"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Bu uygulama bildirim göndermiyor."</string>
     <string name="notification_channels" msgid="1502969522886493799">"Kategoriler"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Diğer"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 41772aa..fbe9a1d 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Ніколи"</item>
-    <item msgid="5065465585332446709">"Через 1 хвилину"</item>
-    <item msgid="622807566366131941">"Через 5 хвилин"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a6d36d9..5b06609 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -459,8 +459,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Вашу модель обличчя буде видалено назавжди.\n\nПісля цього, щоб розблокувати телефон, вам знадобиться використовувати PIN-код, ключ або пароль."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Розблоковуйте телефон за допомогою фейсконтролю"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Відбиток пальця"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Коли ввімкнено розблокування відбитком пальця"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Відбиток пальця (роб.)"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Керування відбитками"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Використ. відбиток для"</string>
@@ -601,16 +600,15 @@
     <skip />
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Реєстрацію відбитка пальця завершено на стільки відсотків: <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Відбиток додано"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Тепер за допомогою відбитка пальця можна розблоковувати планшет або підтверджувати свою особу (наприклад, щоб входити в додатки чи схвалювати покупки)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Тепер за допомогою відбитка пальця можна розблоковувати планшет або підтверджувати свою особу (наприклад, щоб входити в додатки)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Тепер за допомогою відбитка пальця можна розблоковувати пристрій або підтверджувати свою особу (наприклад, щоб входити в додатки)"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Тепер за допомогою відбитка пальця можна розблоковувати телефон або підтверджувати свою особу (наприклад, щоб входити в додатки)"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Розблоковувати, лише коли екран увімкнено"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Перш ніж розблоковувати пристрій відбитком пальця, потрібно ввімкнути екран. Це зменшить імовірність випадкового розблокування."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Екран, розблокування"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Виконати цю процедуру пізніше"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Підніміть і знову прикладіть палець"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Прикладіть до датчика й трохи потримайте одну сторону кінчика пальця, а потім зробіть те саме з іншою стороною"</string>
@@ -1567,8 +1565,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Недоступно в нічному режимі"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Використовувати заставку"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Під час заряджання чи в док-станції"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"У док-станції та під час заряджання"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Під час заряджання"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Коли в док-станції"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Ніколи"</string>
@@ -2880,7 +2877,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Дані про використання"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Використання заряду акумулятора"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Показати споживання за останні 24 години"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Показати споживання після повного заряду"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Після останнього повного заряджання"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Використання заряду додатком"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Вжиток"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Режим енергоспоживання"</string>
@@ -3075,25 +3072,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Використання заряду"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Після повного заряджання"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Використання заряду"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"<xliff:g id="TIME_0">^1</xliff:g> усього • <xliff:g id="TIME_1">^2</xliff:g> споживання у фоновому режимі\nз часу останнього повного заряджання"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Використання після останнього повного заряджання:\nусього <xliff:g id="TIME_0">^1</xliff:g> • у фоновому режимі <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"<xliff:g id="TIME_0">^1</xliff:g> усього • <xliff:g id="TIME_1">^2</xliff:g> споживання у фоновому режимі\nза останні 24 год"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Усього <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> споживання у фоновому режимі\nза період <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Усього менше ніж хвилина з часу останнього повного заряджання"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Використання після останнього повного заряджання: усього менше хвилини"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Усього менше ніж хвилина за останні 24 год"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Усього менше ніж хвилина за період <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Менше ніж хвилина споживання у фоновому режимі з часу останнього повного заряджання"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Використання у фоновому режимі після останнього повного заряджання: менше хвилини"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Менше ніж хвилина споживання у фоновому режимі за останні 24 год"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Менше ніж хвилина споживання у фоновому режимі за період <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"<xliff:g id="TIME">^1</xliff:g> усього з часу останнього повного заряджання"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Використання після останнього повного заряджання: усього <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"<xliff:g id="TIME">^1</xliff:g> усього за останні 24 год"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Усього <xliff:g id="TIME_0">^1</xliff:g> за період <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> споживання у фоновому режимі з часу останнього повного заряджання"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Використання у фоновому режимі після останнього повного заряджання: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> споживання у фоновому режимі за останні 24 год"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> споживання у фоновому режимі за період <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"<xliff:g id="TIME">^1</xliff:g> усього • менше ніж хвилина споживання у фоновому режимі\nз часу останнього повного заряджання"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Використання після останнього повного заряджання:\nусього <xliff:g id="TIME">^1</xliff:g> • у фоновому режимі – менше хвилини"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"<xliff:g id="TIME">^1</xliff:g> усього • менше ніж хвилина споживання у фоновому режимі\nза останні 24 год"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Усього <xliff:g id="TIME_0">^1</xliff:g> • менше ніж хвилина споживання у фоновому режимі\nза період <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Відсутнє споживання з часу останнього повного заряджання"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Заряд акумулятора не використовувався у фоновому режимі після останнього повного заряджання"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Відсутнє споживання за останні 24 години"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Інші користувачі"</string>
@@ -3581,7 +3578,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"<xliff:g id="USER_NAME">%1$s</xliff:g> – видалити з пристрою"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Параметри блокування екрана"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Додавати користувачів на заблокованому екрані"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Переходити в режим адміністратора в док-станції"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Видалити ваш профіль?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Видалити користувача?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Видалити цей профіль?"</string>
@@ -4306,8 +4304,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"За вашим запитом Android блокує на цьому пристрої сповіщення з цього додатка"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваш запит Android блокує цю категорію сповіщень на пристрої"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваш запит Android блокує цю групу сповіщень на пристрої"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Цей додаток не надсилає сповіщення"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Категорії"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Інше"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 7fc7498..2131e8f 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"کبھی نہیں"</item>
-    <item msgid="5065465585332446709">"1 منٹ کے بعد"</item>
-    <item msgid="622807566366131941">"5 منٹ کے بعد"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 98bc81b..463deda 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"‏آپ کے چہرے کے ماڈل کو مستقل اور محفوظ طریقے سے حذف کر دیا جائے گا۔\n\nحذف کرنے کے بعد، آپ کو اپنے فون کو غیر مقفل کرنے کے لیے آپ کو اپنا PIN، پیٹرن یا پاس ورڈ درکار ہوگا۔"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"اپنے فون کو غیر مقفل کرنے کے لیے فیس اَنلاک کا استعمال کریں"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"فنگر پرنٹ"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"فنگر پرنٹ انلاک استعمال کرنے پر"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"کام کیلئے فنگر پرنٹ"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"فنگر پرنٹس کا نظم کریں"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"فنگر پرنٹ استعمال کریں برائے"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"اندراج: <xliff:g id="PERCENTAGE">%d</xliff:g> فیصد"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"فنگر پرنٹ اندراج کرنے کی کارروائی <xliff:g id="PERCENTAGE">%d</xliff:g> فیصد مکمل ہو چکی ہے"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"فنگر پرنٹ شامل ہو گیا"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"اب آپ اپنا ٹیبلیٹ غیر مقفل کرنے یا اس بات کی توثیق کرنے کیلئے اپنے فنگر پرنٹ کا استعمال کر سکتے ہیں کہ یہ آپ ہی ہیں، جیسے جب آپ ایپس میں سائن ان کرتے ہیں یا کسی خریداری کی منظوری دیتے ہیں"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"اب آپ اپنا ٹیبلیٹ غیر مقفل کرنے یا یہ توثیق کرنے کیلئے کہ یہ آپ ہی ہیں، اپنا فنگر پرنٹ استعمال کر سکتے ہیں، جیسے ایپس میں سائن ان کرتے وقت"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"اب آپ اپنا آلہ غیر مقفل کرنے یا یہ توثیق کرنے کیلئے کہ یہ آپ ہی ہیں، اپنا فنگر پرنٹ استعمال کر سکتے ہیں، جیسے ایپس میں سائن ان کرتے وقت"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"اب آپ اپنا فون غیر مقفل کرنے یا یہ توثیق کرنے کیلئے کہ یہ آپ ہی ہیں، اپنا فنگر پرنٹ استعمال کر سکتے ہیں، جیسے ایپس میں سائن ان کرتے وقت"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"اسکرین آن ہونے پر ہی غیر مقفل کریں۔"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"آپ کے فنگر پرنٹ سے غیر مقفل کرنے کے لیے اسکرین کو فعال ہونا چاہیے۔ اس سے حادثاتی طور پر غیر مقفل ہونے کا امکان کم ہو جاتا ہے۔"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"اسکرین کو غیر مقفل کریں"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"اسے بعد میں کریں"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"اٹھائیں، پھر دوبارہ ٹچ کریں"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"اپنے فنگر پرنٹ کے حصے کو سینسر پر رکھیں اور دبائے رکھیں پھر، دوسرے حصے پر سوئچ کریں"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"دستیاب نہیں ہے کیونکہ بیڈ ٹائم موڈ آن ہے"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"اسکرین سیور کا استعمال کریں"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"ڈاک سے منسلک یا چارج ہونے کے دوران"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"ڈاک اور چارج کرتے وقت"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"چارج ہوتے وقت"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"ڈاک کیے ہونے پر"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"کبھی نہیں"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"سرگزشت کی تفصیلات"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"بیٹری کا استعمال"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"گزشتہ 24 گھنٹے کا استعمال ملاحظہ کریں"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"پچھلے مکمل چارج کے بعد سے استعمال دیکھیں"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"پچھلے مکمل چارج کے بعد سے استعمال دیکھیں"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"ایپ کی بیٹری کے استعمال"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"استعمال کی تفصیلات"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"پاور کا استعمال ایڈجسٹ کریں"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"بیٹری کا استعمال"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"مکمل چارج کے بعد سے"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"بیٹری کے استعمال کا نظم کریں"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"کُل <xliff:g id="TIME_0">^1</xliff:g> • پس منظر میں <xliff:g id="TIME_1">^2</xliff:g> بیٹری کا استعمال\nپچھلے مکمل چارج کے بعد سے"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"پچھلے مکمل چارج کے بعد سے\n کل <xliff:g id="TIME_0">^1</xliff:g> • پس منظر میں <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"کُل<xliff:g id="TIME_0">^1</xliff:g> • پس منظر میں <xliff:g id="TIME_1">^2</xliff:g> بیٹری کا استعمال\nگزشتہ 24 گھنٹے میں"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"کُل <xliff:g id="TIME_0">^1</xliff:g> • پس منظر میں <xliff:g id="TIME_1">^2</xliff:g>\n<xliff:g id="TIME_PERIOD">^3</xliff:g> میں"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"پچھلے مکمل چارج کے بعد سے کُل ایک منٹ سے کم بیٹری کا استعمال"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"پچھلے مکمل چارج کے بعد سے کُل ایک منٹ سے کم بیٹری کا استعمال"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"گزشتہ 24 گھنٹے میں کُل ایک منٹ سے کم بیٹری کا استعمال"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> میں کُل ایک منٹ سے کم"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"پچھلے مکمل چارج کے بعد سے پس منظر میں ایک منٹ سے کم بیٹری کا استعمال"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"پچھلے مکمل چارج کے بعد سے پس منظر میں ایک منٹ سے کم بیٹری کا استعمال"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"گزشتہ 24 گھنٹے میں پس منظر میں ایک منٹ سے کم بیٹری کا استعمال"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> میں پس منظر میں ایک منٹ سے کم"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"پچھلے مکمل چارج کے بعد سے کُل <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"پچھلے مکمل چارج کے بعد سے کل <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"گزشتہ 24 گھنٹے میں کُل <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> میں کُل <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"پچھلے مکمل چارج کے بعد سے پس منظر میں <xliff:g id="TIME">^1</xliff:g> بیٹری کا استعمال"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"پچھلے مکمل چارج کے بعد سے پس منظر میں <xliff:g id="TIME">^1</xliff:g> بیٹری کا استعمال"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"گزشتہ 24 گھنٹے میں پس منظر میں <xliff:g id="TIME">^1</xliff:g> بیٹری کا استعمال"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> میں پس منظر میں <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"کُل <xliff:g id="TIME">^1</xliff:g> • پس منظر میں ایک منٹ سے کم\nپچھلے مکمل چارج کے بعد سے"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"پچھلے مکمل چارج کے بعد سے\n کل <xliff:g id="TIME">^1</xliff:g> • پس منظر میں ایک منٹ سے کم"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"کُل <xliff:g id="TIME">^1</xliff:g> • گزشتہ 24 گھنٹے میں\nپس منظر میں ایک منٹ سے کم بیٹری کا استعمال"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"کُل <xliff:g id="TIME_0">^1</xliff:g> • پس منظر میں ایک منٹ سے کم\n<xliff:g id="TIME_PERIOD">^2</xliff:g> میں"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"پچھلے مکمل چارج کے بعد سے بیٹری کا کوئی استعمال نہیں"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"پچھلے مکمل چارج کے بعد سے کوئی استعمال نہیں"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"گزشتہ 24 گھنٹے میں بیٹری کا کوئی استعمال نہیں"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"دیگر صارفین"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"اس آلہ سے <xliff:g id="USER_NAME">%1$s</xliff:g> حذف کریں"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"قفل اسکرین کی ترتیبات"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"مقفل اسکرین سے صارفین کو شامل کریں"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"ڈاک ہونے پر منتظم صارف پر سوئچ کریں"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"اپنے آپ کو حذف کریں؟"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"اس صارف کو حذف کریں؟"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"یہ پروفائل ہٹا دیں؟"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏آپ کی درخواست پر، Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏آپ کی درخواست پر، Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏آپ کی درخواست پر، Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"یہ ایپ اطلاعات نہیں بھیجتی ہے"</string>
     <string name="notification_channels" msgid="1502969522886493799">"زمرے"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"دیگر"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index f038bff..3c265f9 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Hech qachon"</item>
-    <item msgid="5065465585332446709">"1 daqiqadan keyin"</item>
-    <item msgid="622807566366131941">"5 daqiqadan keyin"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1e2fd56..cfe53eb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -594,10 +594,12 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Barmoq izi qo‘shildi"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Endi planshetni qulfdan chiqarish, ilovaga kirish yoki xaridni tasdiqlash kabi hisob tekshiruvida barmoq izidan foydalanishingiz mumkin"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Endi planshetni qulfdan chiqarish yoki ilovaga kirish kabi hisob tekshiruvida barmoq izingizdan foydalanishingiz mumkin"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Endi qurilmani qulfdan chiqarish yoki ilovaga kirish kabi hisob tekshiruvida barmoq izingizdan foydalanishingiz mumkin"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Endi telefonni qulfdan chiqarish yoki ilovaga kirish kabi hisob tekshiruvida barmoq izingizdan foydalanishingiz mumkin"</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
+    <skip />
     <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Faqat ekran yoniqligida qulfdan chiqarilsin"</string>
     <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Barmoq izingiz bilan ocha olishingiz mumkin oldin ekran yoniq boʻlishi kerak. Bu tasodifiy qulfni ochish ehtimolini kamaytiradi."</string>
     <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekran, qulfdan chiqarish"</string>
@@ -2815,7 +2817,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Tafsilotlar"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Batareya sarfi"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Oxirgi 24 soat uchun hisobot"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Toʻliq quvvatlanganidan keyingi batareya sarfi"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Oxirgi toʻliq quvvatdan keyingi sarfi"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Ilovalar batareya sarfi"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Batareya sarfi"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Quvvatdan foydalanishni moslash"</string>
@@ -2996,25 +2998,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Batareya sarfi"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"To‘liq quvvat olganidan beri"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Batareya sarfini boshqarish"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Jami <xliff:g id="TIME_0">^1</xliff:g> • Orqa fon rejimida: <xliff:g id="TIME_1">^2</xliff:g>\n(toʻliq quvvat olgandan keyin)"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Oxirgi toʻliq quvvatdan keyin\n jami: <xliff:g id="TIME_0">^1</xliff:g> • fonda: <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Jami <xliff:g id="TIME_0">^1</xliff:g> • Orqa fon rejimida: <xliff:g id="TIME_1">^2</xliff:g>\n(oxirgi 24 soat ichida)"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Umumiy foydalanish vaqti: <xliff:g id="TIME_0">^1</xliff:g> • Orqa fon rejimida: <xliff:g id="TIME_1">^2</xliff:g>\n(<xliff:g id="TIME_PERIOD">^3</xliff:g> orasida)"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Toʻliq quvvat olgandan keyin jami bir daqiqadan kamroq"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Toʻliq quvvat olgandan keyin fonda bir daqiqadan kam"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"24 soat ichida jami bir daqiqadan kamroq"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ichida jami bir daqiqadan kamroq"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Toʻliq quvvat olgandan keyin bir daqiqadan kamroq orqa fon rejimida"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Toʻliq quvvat olgandan keyin fonda bir daqiqadan kam"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"24 soat ichida bir daqiqadan kamroq orqa fon rejimida"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> ichida bir daqiqadan kamroq orqa fon rejimida"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Toʻliq quvvat olgandan keyin jami <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Toʻliq quvvat olganidan keyin jami: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"24 soat uchun jami <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g> ichida jami <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"Toʻliq quvvat olgandan keyin <xliff:g id="TIME">^1</xliff:g> orqa fon rejimida"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Oxirgi toʻliq quvvatdan keyin fonda <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"24 soat ichida <xliff:g id="TIME">^1</xliff:g> orqa fon rejimida"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> uchun <xliff:g id="TIME_0">^1</xliff:g> orqa fon rejimida"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Jami <xliff:g id="TIME">^1</xliff:g> • Orqa fon rejimida bir daqiqadan kamroq\n(toʻliq quvvat olgandan keyin)"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Oxirgi toʻliq quvvatdan keyin\n jami: <xliff:g id="TIME">^1</xliff:g> • fonda bir daqiqadan kam"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Jami <xliff:g id="TIME">^1</xliff:g> • Orqa fon rejimida bir daqiqadan kamroq\n(oxirgi 24 soat ichida)"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Umumiy foydalanish vaqti: <xliff:g id="TIME_0">^1</xliff:g> • Orqa fon rejimida bir daqiqadan kamroq\n(<xliff:g id="TIME_PERIOD">^2</xliff:g> orasida)"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Toʻliq quvvat olgandan keyin ishlatilmagan"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Oxirgi toʻliq quvvatdan keyin ishlatilmagan"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"24 soat ichida orqa fon rejimi ishlatilmagan"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Boshqa foydalanuvchilar"</string>
@@ -3494,7 +3496,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Olib tashlash (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Qulflangan ekran sozlamalari"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Foydalanuvchilarni ekran qulfidan qo‘shish"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Dok-stantsiyasiga ulanganda administratorga oʻtish"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Profilingiz o‘chirilsinmi?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Olib tashlansinmi?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Profil o‘chirilsinmi?"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index f9e2425..8eb8275 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Không bao giờ"</item>
-    <item msgid="5065465585332446709">"Sau 1 phút"</item>
-    <item msgid="622807566366131941">"Sau 5 phút"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index bb7456e..85c7271 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Mẫu khuôn mặt của bạn sẽ bị xoá vĩnh viễn theo cách an toàn.\n\nSau khi xoá, bạn sẽ cần nhập mã PIN, hình mở khoá hoặc mật khẩu để mở khoá điện thoại."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Dùng tính năng Mở khóa bằng khuôn mặt để mở khóa điện thoại"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Vân tay"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Khi dùng tính năng Mở khoá bằng vân tay"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Vân tay cho công việc"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Quản lý vân tay"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Sử dụng vân tay để"</string>
@@ -595,16 +594,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Đã thêm vân tay"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Giờ đây, bạn có thể dùng vân tay để mở khoá máy tính bảng hoặc xác minh danh tính, chẳng hạn như khi đăng nhập vào ứng dụng hoặc phê duyệt giao dịch mua"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Giờ đây, bạn có thể dùng vân tay để mở khóa máy tính bảng hoặc xác minh danh tính, chẳng hạn như khi bạn đăng nhập vào các ứng dụng"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Giờ đây, bạn có thể dùng vân tay để mở khóa thiết bị hoặc xác minh danh tính, chẳng hạn như khi bạn đăng nhập vào các ứng dụng"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Giờ đây, bạn có thể dùng vân tay để mở khóa điện thoại hoặc xác minh danh tính, chẳng hạn như khi bạn đăng nhập vào các ứng dụng"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Chỉ mở khoá khi màn hình đang bật"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Màn hình phải bật thì bạn mới có thể mở khoá bằng vân tay. Yêu cầu này nhằm giảm thiểu tình trạng mở khoá ngoài ý muốn."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Màn hình, mở khoá"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Thực hiện sau"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Nhấc ngón tay lên rồi chạm lại"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Đặt vân tay ở phần bên của ngón tay lên cảm biến rồi giữ, sau đó chuyển sang phần bên kia"</string>
@@ -2819,7 +2817,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Chi tiết lịch sử"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Mức sử dụng pin"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Xem mức sử dụng trong 24 giờ qua"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Xem mức sử dụng từ lần sạc đầy gần nhất"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Xem mức sử dụng từ lần sạc đầy gần nhất"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Mức sử dụng pin của ứng dụng"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Chi tiết sử dụng"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Điều chỉnh việc sử dụng nguồn"</string>
@@ -3000,25 +2998,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Mức sử dụng pin"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Kể từ lúc sạc đầy"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Quản lý mức sử dụng pin"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"Tổng cộng <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ở chế độ nền\nkể từ lần sạc đầy gần đây nhất"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"Tổng <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ở chế độ nền\nkể từ lần sạc đầy gần nhất"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"Tổng cộng <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ở chế độ nền\ntrong 24 giờ qua"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"Tổng <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> ở chế độ nền\ntrong khoảng thời gian <xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Tổng cộng chưa đến 1 phút kể từ lần sạc gần đây nhất"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Tổng chưa đến 1 phút kể từ lần sạc đầy gần nhất"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Tổng cộng chưa đến 1 phút trong 24 giờ qua"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Tổng chưa đến 1 phút trong khoảng thời gian <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Ở chế độ nền chưa đến 1 phút kể từ lần sạc gần đây nhất"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Chưa đến 1 phút ở chế độ nền kể từ lần sạc đầy gần nhất"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Ở chế độ nền chưa đến 1 phút trong 24 giờ qua"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Ở chế độ nền chưa đến 1 phút trong khoảng thời gian <xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"Tổng cộng <xliff:g id="TIME">^1</xliff:g> kể từ lần sạc đầy gần đây nhất"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"Tổng <xliff:g id="TIME">^1</xliff:g> kể từ lần sạc đầy gần nhất"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"Tổng cộng <xliff:g id="TIME">^1</xliff:g> trong 24 giờ qua"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"Tổng <xliff:g id="TIME_0">^1</xliff:g> trong khoảng thời gian <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> ở chế độ nền kể từ lần sạc đầy gần nhất"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"<xliff:g id="TIME">^1</xliff:g> ở chế độ nền kể từ lần sạc đầy gần nhất"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> ở chế độ nền trong 24 giờ qua"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> ở chế độ nền trong khoảng thời gian <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"Tổng cộng <xliff:g id="TIME">^1</xliff:g> • Ở chế độ nền chưa đến 1 phút\nkể từ lần sạc đầy gần đây nhất"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"Tổng <xliff:g id="TIME">^1</xliff:g> • chưa đến 1 phút ở chế độ nền\nkể từ lần sạc đầy gần nhất"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"Tổng cộng <xliff:g id="TIME">^1</xliff:g> • Ở chế độ nền chưa đến 1 phút\ntrong 24 giờ qua"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"Tổng <xliff:g id="TIME_0">^1</xliff:g> • Ở chế độ nền chưa đến 1 phút\ntrong khoảng thời gian <xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Không sử dụng pin kể từ lần sạc đầy gần đây nhất"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Không sử dụng kể từ lần sạc đầy gần nhất"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Không sử dụng pin trong 24 giờ qua"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Người dùng khác"</string>
@@ -3498,7 +3496,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Xóa <xliff:g id="USER_NAME">%1$s</xliff:g> khỏi thiết bị"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Cài đặt màn hình khóa"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Thêm người dùng từ màn hình khóa"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Chuyển sang người dùng quản trị khi gắn vào đế sạc"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Xóa chính bạn?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Xóa người dùng này?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Xóa hồ sơ này?"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index f800263..7c01a56 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"永不"</item>
-    <item msgid="5065465585332446709">"1 分钟后"</item>
-    <item msgid="622807566366131941">"5 分钟后"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e84f36f..6eb8c94 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"系统会安全地永久删除您的脸部模型。\n\n脸部模型删除后，如需解锁手机，您将需要使用 PIN 码、解锁图案或密码。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"使用人脸解锁功能解锁手机"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"指纹"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"使用指纹解锁功能时"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"工作资料指纹"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"管理指纹"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"将指纹用于以下用途："</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"当前注册进度为百分之 <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"指纹注册进度为百分之 <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指纹已添加"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"现在，您可以通过指纹来解锁平板电脑或验证自己的身份，例如登录各种应用或批准购买交易"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"现在您可以使用指纹解锁平板电脑或验证自己的身份，例如在登录应用时"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"现在您可以使用指纹解锁设备或验证自己的身份，例如在登录应用时"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"现在您可以使用指纹解锁手机或验证自己的身份，例如在登录应用时"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"仅在屏幕开启时解锁"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"屏幕必须开启，然后您才能使用指纹解锁。这样可以降低意外解锁的可能性。"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"屏幕, 解锁, Screen, Unlock"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"以后再说"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"移开手指，然后再次触摸传感器"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"将指纹的一侧放在传感器上并按住，然后切换到另一侧"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"就寝模式开启时无法使用"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"使用屏保"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"充电或插入基座时"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"插入基座充电时"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"充电时"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"插入基座时"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"一律不"</string>
@@ -2814,7 +2811,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"详细电量使用记录"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"电池用量"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"查看过去 24 小时的使用情况"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"查看自上次充满电后的使用情况"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"查看自上次充满电后的电池用量"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"应用的电池用量"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"详细使用情况"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"省电提示"</string>
@@ -2995,25 +2992,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"电池用量"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"自充满电后"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"管理电池用量"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"共 <xliff:g id="TIME_0">^1</xliff:g> • 自电池上次充满电后，在后台使用了 <xliff:g id="TIME_1">^2</xliff:g>\n"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"共使用了 <xliff:g id="TIME_0">^1</xliff:g> • 自上次充满电后，\n在后台使用了 <xliff:g id="TIME_1">^2</xliff:g>"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"共 <xliff:g id="TIME_0">^1</xliff:g> • 过去 24 小时内在后台使用了 <xliff:g id="TIME_1">^2</xliff:g>\n"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"共 <xliff:g id="TIME_0">^1</xliff:g> • 后台使用了 <xliff:g id="TIME_1">^2</xliff:g>\n（<xliff:g id="TIME_PERIOD">^3</xliff:g>）"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"自电池上次充满电后，共使用了不到 1 分钟"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"自上次充满电后，共使用了不到 1 分钟"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"过去 24 小时内共使用了不到 1 分钟"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g>之间共使用了不到 1 分钟"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"自电池上次充满电后，在后台使用了不到 1 分钟"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"自电池上次充满电后，在后台使用了不到 1 分钟"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"过去 24 小时内在后台使用了不到 1 分钟"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g>之间在后台使用了不到 1 分钟"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"自电池上次充满电后，共使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"自上次充满电后，共使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"过去 24 小时内共使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>之间共使用了 <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"自电池上次充满电后，在后台使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"自上次充满电后，在后台使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"过去 24 小时内在后台使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g>之间在后台使用了 <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"共 <xliff:g id="TIME">^1</xliff:g> • 自电池上次充满电后，在后台使用了不到 1 分钟\n"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"共使用了 <xliff:g id="TIME">^1</xliff:g> • 自上次充满电后，\n在后台使用了不到 1 分钟"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"共 <xliff:g id="TIME">^1</xliff:g> • 过去 24 小时内在后台使用了不到 1 分钟\n"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"共 <xliff:g id="TIME_0">^1</xliff:g> • 后台使用了不到 1 分钟\n（<xliff:g id="TIME_PERIOD">^2</xliff:g>）"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"自电池上次充满电后未使用过"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"自上次充满电后，未曾使用"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"过去 24 小时内未使用过"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"其他用户"</string>
@@ -3493,7 +3490,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"锁定屏幕设置"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"从锁定屏幕中添加用户"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"插入基座时切换到管理员用户"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"是否删除自己？"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"要删除此用户吗？"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"要移除此个人资料吗？"</string>
@@ -4206,8 +4204,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"根据您的要求，Android 会阻止此应用的通知显示在此设备上"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"根据您的要求，Android 会阻止这类通知显示在此设备上"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"根据您的要求，Android 会阻止这组通知显示在此设备上"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"此应用不会发送通知"</string>
     <string name="notification_channels" msgid="1502969522886493799">"类别"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"其他"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index aa232fe..7a48720 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"永不"</item>
-    <item msgid="5065465585332446709">"1 分鐘後"</item>
-    <item msgid="622807566366131941">"5 分鐘後"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c1e896b..eea9300 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"系統會妥善地將您的面部模型永久刪除。面部模型刪除後，您便需要使用\n\n面部模型刪除後，您便需要使用 PIN、圖案或密碼來解鎖手機。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"使用「面孔解鎖」解鎖手機"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"指紋"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"使用「指紋解鎖」時"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"工作設定檔的指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"使用指紋"</string>
@@ -591,16 +590,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"已加入指紋"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"現在可使用指紋解鎖平板電腦或驗證身分，例如用來登入應用程式或核准購買交易"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"現在可使用指紋解鎖平板電腦或驗證身分，例如用來登入應用程式"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"現在可使用指紋解鎖裝置或驗證身分，例如用來登入應用程式"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"現在可使用指紋解鎖手機或驗證身分，例如用來登入應用程式"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"僅在螢幕開啟時解鎖"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"您必須先開啟螢幕，才可以使用指紋解鎖，以避免意外解鎖。"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"螢幕解鎖"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"稍後再做"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"移開手指，然後再次輕觸感應器"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"將指紋的一側放上感應器並按住，然後再換另一側"</string>
@@ -1525,7 +1523,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"睡眠模式開啟時無法使用"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"使用螢幕保護程式"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"充電或放上插座時"</string>
-    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"已插上座架並進行充電時"</string>
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"放上插座充電時"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"充電時"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"放上插座時"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"永不"</string>
@@ -2816,7 +2814,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"詳細記錄"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"電池電量"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"查看過去 24 小時的使用情況"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"查看上次充滿電後的使用情況"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"查看自上次充飽電後的電池用量"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"應用程式電池用量"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"詳細使用狀況"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"調整電力使用"</string>
@@ -2997,25 +2995,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"電池用量"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"上次充滿電後"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"管理電池用量"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用 <xliff:g id="TIME_1">^2</xliff:g>\n(從上次充滿電後)"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"自上次充飽電後使用電池的時間總長度為 <xliff:g id="TIME_0">^1</xliff:g> • 在背景使用電池的時間長度為 <xliff:g id="TIME_1">^2</xliff:g>\n"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用 <xliff:g id="TIME_1">^2</xliff:g>\n(過去 24 小時)"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用 <xliff:g id="TIME_1">^2</xliff:g>\n(<xliff:g id="TIME_PERIOD">^3</xliff:g>)"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"上次充滿電後使用電池的總時間長度少於一分鐘"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"自上次充飽電後使用電池的時間總長度不到一分鐘"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"過去 24 小時使用電池的總時間長度少於一分鐘"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g> 這段期間內使用電池的總時間長度少於一分鐘"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"上次充滿電後在背景使用電池的時間長度少於一分鐘"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"自上次充飽電後在背景使用電池的時間長度不到一分鐘"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"過去 24 小時在背景使用電池的時間長度少於一分鐘"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> 這段期間內在背景使用電池的時間長度少於一分鐘"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"上次充滿電後使用電池的總時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"自上次充飽電後使用電池的時間總長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"過去 24 小時總共使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>這段期間內使用電池的總時間長度為 <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"上次充滿電後在背景使用電池的時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"自上次充飽電後在背景使用電池的時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"過去 24 小時在背景使用電池的時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> 這段期間內在背景使用電池的時間長度為 <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"總共使用 <xliff:g id="TIME">^1</xliff:g> • 背景使用時間不到一分鐘\n(從上次充滿電後)"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"自上次充飽電後使用電池的時間總長度為 <xliff:g id="TIME">^1</xliff:g> • 在背景使用電池的時間長度不到一分鐘\n"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"總共使用了 <xliff:g id="TIME">^1</xliff:g> • 背景使用時間少於一分鐘\n(過去 24 小時)"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用時間不到一分鐘\n(<xliff:g id="TIME_PERIOD">^2</xliff:g>)"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"上次充滿電後未使用電池"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"自上次充飽電後未曾使用"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"過去 24 小時未使用電池"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"其他使用者"</string>
@@ -3495,7 +3493,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這部裝置中刪除"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"上鎖畫面設定"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"在上鎖畫面加入使用者"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"放上插座後切換至管理員使用者"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"您要刪除自己嗎？"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"要刪除這名使用者嗎？"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"移除這個設定檔？"</string>
@@ -4208,7 +4207,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android 目前按您的要求防止這個應用程式的通知在此裝置上顯示"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android 目前按您的要求防止這類通知在此裝置上顯示"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android 目前按您的要求防止這類通知在此裝置上顯示"</string>
-    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"這個應用程式不會傳送通知"</string>
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"此應用程式不會傳送通知"</string>
     <string name="notification_channels" msgid="1502969522886493799">"類別"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"其他"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 6cd3522..9543372 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"永不"</item>
-    <item msgid="5065465585332446709">"1 分鐘後"</item>
-    <item msgid="622807566366131941">"5 分鐘後"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 685e9d5..a06c7c9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"系統會安全地將臉部模型永久刪除。\n\n模型刪除後，你必須使用 PIN 碼、解鎖圖案或密碼才能解鎖手機。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"使用人臉解鎖功能解鎖手機"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"指紋"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"使用指紋解鎖時"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"使用指紋解鎖工作資料夾"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"指紋辨識用途："</string>
@@ -591,16 +590,15 @@
     <!-- no translation found for security_settings_udfps_enroll_progress_a11y_message (6183535114682369699) -->
     <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指紋新增成功"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"現在只要使用自己的指紋就能解鎖平板電腦或驗證身分以執行操作，例如登入應用程式或核准購買交易"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"你現在可以使用指紋解鎖平板電腦或驗證身分，以便執行特定操作，例如登入應用程式"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"你現在可以使用指紋解鎖裝置或驗證身分，以便執行特定操作，例如登入應用程式"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"你現在可以使用指紋解鎖手機或驗證身分，以便執行特定操作，例如登入應用程式"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"螢幕亮起時才能解鎖裝置"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"必須先讓螢幕亮起，才能使用指紋解鎖裝置。這麼做可降低意外解鎖的可能性。"</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"螢幕解鎖"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"稍後再說"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"移開手指，然後再次輕觸感應器"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"將指紋的一側放上感應器並按住，然後再換另一側"</string>
@@ -2815,7 +2813,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"詳細記錄"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"電池用量"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"查看過去 24 小時的使用情形"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"查看最近一次充飽電後的使用情形"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"查看自上次充飽電後的電池用量"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"應用程式電池用量"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"使用狀況詳細資訊"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"調整電力使用"</string>
@@ -2996,25 +2994,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"電池用量"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"自上次充飽電後"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"管理電池用量"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用 <xliff:g id="TIME_1">^2</xliff:g>\n(從上次充飽電後)"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"自上次充飽電後使用電池的時間總長度為 <xliff:g id="TIME_0">^1</xliff:g> • 在背景使用電池的時間長度為 <xliff:g id="TIME_1">^2</xliff:g>\n"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用 <xliff:g id="TIME_1">^2</xliff:g>\n(過去 24 小時)"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用 <xliff:g id="TIME_1">^2</xliff:g>\n(<xliff:g id="TIME_PERIOD">^3</xliff:g>)"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"從上次充飽電後使用電池的總時間長度不到一分鐘"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"自上次充飽電後使用電池的時間總長度不到一分鐘"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"過去 24 小時使用電池的總時間長度不到一分鐘"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"<xliff:g id="TIME_PERIOD">^1</xliff:g>之間的累計電池使用時間不到一分鐘"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"從上次充飽電後在背景使用電池的時間長度不到一分鐘"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"自上次充飽電後在背景使用電池的時間長度不到一分鐘"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"過去 24 小時在背景使用電池的時間長度不到一分鐘"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"<xliff:g id="TIME_PERIOD">^1</xliff:g> 這段期間內在背景使用電池的時間長度不到一分鐘"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"從上次充飽電後總共使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"自上次充飽電後使用電池的時間總長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"過去 24 小時總共使用了 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"<xliff:g id="TIME_PERIOD">^2</xliff:g>之間的累計電池使用時間為 <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"從上次充飽電後在背景使用電池的時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"自上次充飽電後在背景使用電池的時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"過去 24 小時在背景使用電池的時間長度為 <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_PERIOD">^2</xliff:g> 這段期間內在背景使用電池的時間長度為 <xliff:g id="TIME_0">^1</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"總共使用 <xliff:g id="TIME">^1</xliff:g> • 背景使用時間不到一分鐘\n(從上次充飽電之後)"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"自上次充飽電後使用電池的時間總長度為 <xliff:g id="TIME">^1</xliff:g> • 在背景使用電池的時間長度不到一分鐘\n"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"總共使用 <xliff:g id="TIME">^1</xliff:g> • 背景使用時間不到一分鐘\n(過去 24 小時)"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"總共使用 <xliff:g id="TIME_0">^1</xliff:g> • 背景使用時間不到一分鐘\n(<xliff:g id="TIME_PERIOD">^2</xliff:g>)"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"從上次充飽電後未曾使用"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"自上次充飽電後未曾使用"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"過去 24 小時未曾使用"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"其他使用者"</string>
@@ -3494,7 +3492,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這個裝置中刪除"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"螢幕鎖定設定"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"在螢幕鎖定畫面中新增使用者"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"插入座架後切換成管理員使用者"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"你要刪除自己嗎？"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"要刪除這位使用者嗎？"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"移除這個設定檔？"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 7c56f04..f23133d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -586,9 +586,7 @@
     <item msgid="2373999996715432397">"0"</item>
     <item msgid="5305176997036663262">"1"</item>
   </string-array>
-  <string-array name="switch_to_user_zero_when_docked_timeout_entries">
-    <item msgid="4844842227131211168">"Soze"</item>
-    <item msgid="5065465585332446709">"Ngemuva komzuzu o-1"</item>
-    <item msgid="622807566366131941">"Ngemuva kwemizuzu eyi-10"</item>
-  </string-array>
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:0 (3211660022507486536) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:1 (7025253383416830453) -->
+    <!-- no translation found for switch_to_dock_user_when_docked_timeout_entries:2 (1574040255478150028) -->
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3071ce6..3978731 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -453,8 +453,7 @@
     <string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Imodeli yakho yobuso izosulwa ingunaphakade nangokuphephile.\n\nNgemuva kokusulwa, uzodinga iphinikhodi yakho, iphethini, noma iphasiwedi ukuze uvule ifoni yakho."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Sebenzisa Ukuvula ngobuso ukuvula ifoni yakho"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Izigxivizo zeminwe"</string>
-    <!-- no translation found for security_settings_fingerprint_settings_preferences_category (8975029409126780752) -->
-    <skip />
+    <string name="security_settings_fingerprint_settings_preferences_category" msgid="8975029409126780752">"Uma usebenzisa Ukuvula Ngesigxivizo Somunwe"</string>
     <string name="security_settings_work_fingerprint_preference_title" msgid="2076006873519745979">"Isigxivizo somunwe somsebenzi"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Phatha izigxivizo zeminwe"</string>
     <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Sebenzisa izigxivizo zeminwe ukuthi"</string>
@@ -589,16 +588,15 @@
     <string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Kubhaliswe amaphesenti angu-<xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
     <string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Iphesenti elingu-<xliff:g id="PERCENTAGE">%d</xliff:g> lokubhalisela izigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Izigxivizo zeminwe zingeziwe"</string>
-    <string name="security_settings_sfps_enroll_finish" msgid="3948249010300560451">"Manje ungasebenzisa isigxivizo somunwe wakho ukuvula ithebulethi yakho noma ukuqinisekisa ukuthi nguwe, njengalapho ungena ngemvume kuma-app noma ugunyaza ukuthenga"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="4372740782513990687">"Manje usungasebenzisa isigxivizo sakho somunwe ukuvula ithebulethi yakho noma ukuqinisekisa ukuthi nguwe, njengalapho ungena ngemvume kuma-app"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="6208711210125838327">"Manje usungasebenzisa isigxivizo sakho somunwe ukuvula idivayisi yakho noma ukuqinisekisa ukuthi nguwe, njengalapho ungena ngemvume kuma-app"</string>
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="4755651286485895622">"Manje usungasebenzisa isigxivizo sakho somunwe ukuvula ifoni yakho noma ukuqinisekisa ukuthi nguwe, njengalapho ungena ngemvume kuma-app"</string>
-    <!-- no translation found for security_settings_require_screen_on_to_auth_title (6393244827110756927) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (6064618417107305796) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_description (8555651197315796037) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (1948980056333872057) -->
     <skip />
-    <!-- no translation found for security_settings_require_screen_on_to_auth_keywords (5557869560397089603) -->
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_v2_message (3084541878035403475) -->
     <skip />
+    <string name="security_settings_require_screen_on_to_auth_title" msgid="6393244827110756927">"Vula kuphela uma isikrini sivuliwe"</string>
+    <string name="security_settings_require_screen_on_to_auth_description" msgid="8555651197315796037">"Isikrini kufanele sivulwe ngaphambi kokuthi uvule ngesigxivizo somunwe. Lokhu kwenza ukuvula ngephutha kungabi bikho kangako."</string>
+    <string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ukuvula, Isikrini"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Yenza kamuva"</string>
     <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Phakamisa, bese uthinte futhi"</string>
     <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Beka uhlangothi lwesigxivizo sakho somunwe kunzwa uphinde ubambe, bese ushintshela kolunye uhlangothi"</string>
@@ -1523,8 +1521,7 @@
     <string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Akutholakali ngoba imodi yesikhathi sokulala ivuliwe"</string>
     <string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Sebenzisa isilondolozi sesikrini"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Ngenkathi ishaja noma idokhiwe"</string>
-    <!-- no translation found for screensaver_settings_summary_dock_and_charging (8485905100159376156) -->
-    <skip />
+    <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Ngenkathi idokhiwe futhi ishaja"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Ngenkathi ishaja"</string>
     <string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Ngenkathi idokhiwe"</string>
     <string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Akusoze"</string>
@@ -2815,7 +2812,7 @@
     <string name="history_details_title" msgid="8628584613889559355">"Imininingwane yomlando"</string>
     <string name="advanced_battery_preference_title" msgid="3790901207877260883">"Ukusetshenziswa kwebhethri"</string>
     <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Buka ukusetshenziswa kwamahora angama-24 edlule"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"Buka ukusetshenziswa kusuka ekushajeni okugcwele kokugcina"</string>
+    <string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Buka ukusetshenziswa kusuka ekushajeni okugcwele kokugcina"</string>
     <string name="battery_details_title" msgid="3289680399291090588">"Ukusetshenziswa kwebhethri yi-app"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"Sebenzisa imininingwane"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"Lungisa amandla okusebenza"</string>
@@ -2996,25 +2993,25 @@
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"Ukusetshenziswa kwebhethri"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"Kusuka ligcwele ngokuphelele"</string>
     <string name="battery_detail_manage_title" msgid="7910805419446927887">"Phatha ukusetshenziswa kwebhethri"</string>
-    <string name="battery_total_and_bg_usage" msgid="8266478675516886819">"ingqikithi <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> indawo engemuva\nkusukela ekushajweni kokugcina okugcwele"</string>
+    <string name="battery_total_and_bg_usage" msgid="8435738393326063685">"<xliff:g id="TIME_0">^1</xliff:g> ingqikithi • <xliff:g id="TIME_1">^2</xliff:g> ingemuva\nkusuka ekushajweni okugcwele kokugcina"</string>
     <string name="battery_total_and_bg_usage_24hr" msgid="2393832614028187281">"ingqikithi <xliff:g id="TIME_0">^1</xliff:g> • <xliff:g id="TIME_1">^2</xliff:g> indawo engemuva\nkumahora angama-24 adlule"</string>
     <string name="battery_total_and_bg_usage_with_period" msgid="2809037516933951047">"isamba <xliff:g id="TIME_0">^1</xliff:g> • ingemuva <xliff:g id="TIME_1">^2</xliff:g>\nngo-<xliff:g id="TIME_PERIOD">^3</xliff:g>"</string>
-    <string name="battery_total_usage_less_minute" msgid="7614894994853812076">"Ingqikithi ingaphansi komzuzu kusuka ekushajweni okugcwele kokugcina"</string>
+    <string name="battery_total_usage_less_minute" msgid="3199193389086828320">"Ingqikithi ingaphansi komzuzu kusuka ekushajweni okugcwele kokugcina"</string>
     <string name="battery_total_usage_less_minute_24hr" msgid="699268449496083696">"Ingqikithi iingaphansi komzuzu emahoreni angama-24 adlule"</string>
     <string name="battery_total_usage_less_minute_with_period" msgid="571923652373556609">"Isamba singaphansi komzuzu kokungu-<xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_bg_usage_less_minute" msgid="3919299699317615641">"Ingemuva lingaphansi komzuzu kusuka ekushajweni okugcwele kokugcina"</string>
+    <string name="battery_bg_usage_less_minute" msgid="7776884932074493406">"Ingemuva lingaphansi komzuzu kusuka ekushajeni okugcwele kokugcina"</string>
     <string name="battery_bg_usage_less_minute_24hr" msgid="5016983623297552985">"Indawo engemuva ngaphansi komzuzu emahoreni angama-24 adlule"</string>
     <string name="battery_bg_usage_less_minute_with_period" msgid="7624741677867017430">"Indawo engemuva ngaphansi komzuzu we-<xliff:g id="TIME_PERIOD">^1</xliff:g>"</string>
-    <string name="battery_total_usage" msgid="4685408616230899847">"ingqikithi engu-<xliff:g id="TIME">^1</xliff:g> kusukela ekushajeni kokugcina okugcwele"</string>
+    <string name="battery_total_usage" msgid="4811532932663354619">"ingqikithi engu-<xliff:g id="TIME">^1</xliff:g> kusuka ekushajweni okugcwele kokugcina"</string>
     <string name="battery_total_usage_24hr" msgid="3907495067623665787">"ingqikithi engu-<xliff:g id="TIME">^1</xliff:g> yamahora angama-24 adlule"</string>
     <string name="battery_total_usage_with_period" msgid="2849061229625950626">"isamba esingu-<xliff:g id="TIME_0">^1</xliff:g> kokungu-<xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_bg_usage" msgid="548670902301883980">"<xliff:g id="TIME">^1</xliff:g> indawo engemuva kusukela ekushajweni kugcwale kokugcina"</string>
+    <string name="battery_bg_usage" msgid="8262917746299259350">"Ingemuva lango-<xliff:g id="TIME">^1</xliff:g> kusuka ekushajeni okugcwele kokugcina"</string>
     <string name="battery_bg_usage_24hr" msgid="1999734910656674710">"<xliff:g id="TIME">^1</xliff:g> indawo engemuva emahoreni angama-24 adlule"</string>
     <string name="battery_bg_usage_with_period" msgid="992952174445045711">"<xliff:g id="TIME_0">^1</xliff:g> indawo engemuva ye-<xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="1460882261983325026">"ingqikithi engu-<xliff:g id="TIME">^1</xliff:g> • indawo engemuva ingaphansi komzuzu\nkusuka ekushajweni kokugcina okugcwele"</string>
+    <string name="battery_total_usage_and_bg_less_minute_usage" msgid="3861884807364163833">"<xliff:g id="TIME">^1</xliff:g> ingqikithi • ingemuva elingaphansi komzuzu\nkusuka ekushajweni okugcwele kokugcina"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_24hr" msgid="1721830675789709748">"ingqikithi engu-<xliff:g id="TIME">^1</xliff:g> • indawo engemuva ngaphansi komzuzu\nwamahora angama-24 edlule"</string>
     <string name="battery_total_usage_and_bg_less_minute_usage_with_period" msgid="5943281928474598517">"isamba <xliff:g id="TIME_0">^1</xliff:g> • ingemuva lingaphansi kweminithi\nku-<xliff:g id="TIME_PERIOD">^2</xliff:g>"</string>
-    <string name="battery_not_usage" msgid="1472275761547230196">"Akusetshenziswanga kusuka ekushajweni kokugcina okugcwele"</string>
+    <string name="battery_not_usage" msgid="3851536644733662392">"Akukho ukusetshenziswa kusuka ekushajweni okugcwele kokugcina"</string>
     <string name="battery_not_usage_24hr" msgid="8397519536160741248">"Akusetshenziswanga emahoreni angama-24 adlule"</string>
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Abanye abasebenzisi"</string>
@@ -3494,7 +3491,8 @@
     <string name="user_remove_user_menu" msgid="2183714948094429367">"Susa i-<xliff:g id="USER_NAME">%1$s</xliff:g> kule divayisi"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"Khiya izilungiselelo zesikrini"</string>
     <string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Engeza abasebenzisi kusuka esikrinini sokukhiya"</string>
-    <string name="switch_to_user_zero_when_docked" msgid="2554028721803481458">"Shintshela kumsebenzisi ongumphathi lapho kudokhiwe"</string>
+    <!-- no translation found for switch_to_dock_user_when_docked (2324395443311905635) -->
+    <skip />
     <string name="user_confirm_remove_self_title" msgid="926265330805361832">"Zisuse wena?"</string>
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"Susa lo msebenzisi?"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Susa le phrofayela?"</string>
@@ -4207,8 +4205,7 @@
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Ngokwesicelo sakho, i-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Ngokwesicelo sakho i-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Ngokwesicelo sakho i-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
-    <!-- no translation found for app_notifications_not_send_desc (5683060986735070528) -->
-    <skip />
+    <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Le app ayithumeli izaziso"</string>
     <string name="notification_channels" msgid="1502969522886493799">"Izigaba"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Okunye"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f8b7f00..73de183 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1623,15 +1623,15 @@
         <item>1</item>
     </string-array>
 
-    <!-- Setting entries for timing out to user 0 when docked. -->
-    <string-array name="switch_to_user_zero_when_docked_timeout_entries">
+    <!-- Setting entries for timing out to the Dock User when docked. -->
+    <string-array name="switch_to_dock_user_when_docked_timeout_entries">
         <item>Never</item>
         <item>After 1 minute</item>
         <item>After 5 minutes</item>
     </string-array>
 
-    <!-- Setting values for timing out to user 0 when docked. [DO NOT TRANSLATE] -->
-    <string-array name="switch_to_user_zero_when_docked_timeout_values" translatable="false">
+    <!-- Setting values for timing out to the Dock User when docked. [DO NOT TRANSLATE] -->
+    <string-array name="switch_to_dock_user_when_docked_timeout_values" translatable="false">
         <!-- Never -->
         <item>0</item>
         <!-- 1 minute -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a23df3d..6352c2b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7890,9 +7890,10 @@
     <string name="user_lockscreen_settings">Lock screen settings</string>
     <!-- User settings item to allow creating new users from locks screen [CHAR LIMIT=50] -->
     <string name="user_add_on_lockscreen_menu">Add users from lock screen</string>
-    <!-- User settings item to allow the system to automatically switch back to the admin user when
+    <!-- TODO(b/257333623): HSUM has no 1:1 admin:dream relationship. There can even be >1 admin -->
+    <!-- User settings item to allow the system to automatically switch back to the Dock User when
          the device is docked. [CHAR LIMIT=50] -->
-    <string name="switch_to_user_zero_when_docked">Switch to admin user when docked</string>
+    <string name="switch_to_dock_user_when_docked">Switch to admin user when docked</string>
 
     <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
     <string name="user_confirm_remove_self_title">Delete yourself?</string>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 5cbfe43..c14bfbd 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -86,10 +86,10 @@
         settings:allowDividerAbove="true"/>
 
     <com.android.settingslib.RestrictedPreference
-        android:key="timeout_to_user_zero_preference"
-        android:title="@string/switch_to_user_zero_when_docked"
+        android:key="timeout_to_dock_user_preference"
+        android:title="@string/switch_to_dock_user_when_docked"
         android:order="106"
-        android:fragment="com.android.settings.users.TimeoutToUserZeroSettings"
-        settings:controller="com.android.settings.users.TimeoutToUserZeroPreferenceController"/>
+        android:fragment="com.android.settings.users.TimeoutToDockUserSettings"
+        settings:controller="com.android.settings.users.TimeoutToDockUserPreferenceController"/>
 
 </PreferenceScreen>
diff --git a/res/xml/user_timeout_to_user_zero_settings.xml b/res/xml/user_timeout_to_dock_user_settings.xml
similarity index 92%
rename from res/xml/user_timeout_to_user_zero_settings.xml
rename to res/xml/user_timeout_to_dock_user_settings.xml
index 54121a3..42eae26 100644
--- a/res/xml/user_timeout_to_user_zero_settings.xml
+++ b/res/xml/user_timeout_to_dock_user_settings.xml
@@ -17,4 +17,4 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/switch_to_user_zero_when_docked"/>
+    android:title="@string/switch_to_dock_user_when_docked"/>
diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
index 747bd78..f8d54a2 100644
--- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -169,6 +169,7 @@
     public void onPause() {
         mParent.getLoaderManager().destroyLoader(
                 AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
+        closeBatteryUsageStats();
     }
 
     private void loadBatteryDiffEntries() {
@@ -292,6 +293,7 @@
         @Override
         public void onLoadFinished(Loader<BatteryUsageStats> loader,
                 BatteryUsageStats batteryUsageStats) {
+            closeBatteryUsageStats();
             mBatteryUsageStats = batteryUsageStats;
             AppBatteryPreferenceController.this.onLoadFinished();
         }
@@ -300,4 +302,16 @@
         public void onLoaderReset(Loader<BatteryUsageStats> loader) {
         }
     }
+
+    private void closeBatteryUsageStats() {
+        if (mBatteryUsageStats != null) {
+            try {
+                mBatteryUsageStats.close();
+            } catch (Exception e) {
+                Log.e(TAG, "BatteryUsageStats.close() failed", e);
+            } finally {
+                mBatteryUsageStats = null;
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
index 5d0b63c..a994b95 100644
--- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -103,10 +103,9 @@
                         0 /* requestCode */, faceIntent,
                         PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
                 intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp);
-
-                BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
-                        hardwareAuthToken, mGkPwHandle, mUserId);
             }
+            BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
+                    hardwareAuthToken, mGkPwHandle, mUserId);
         }));
     }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 9598019..897e290 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -77,6 +77,8 @@
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.template.DescriptionMixin;
+import com.google.android.setupdesign.template.HeaderMixin;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -341,6 +343,9 @@
                 return true;
             });
         }
+
+        final Configuration config = getApplicationContext().getResources().getConfiguration();
+        maybeHideSfpsText(config);
     }
 
     @Override
@@ -415,7 +420,7 @@
         // showErrorDialog() will cause onWindowFocusChanged(false), set mIsCanceled to false
         // before showErrorDialog() to prevent that another error dialog is triggered again.
         mIsCanceled = true;
-        FingerprintErrorDialog.showErrorDialog(this, errorMsgId);
+        FingerprintErrorDialog.showErrorDialog(this, errorMsgId, mCanAssumeUdfps);
         mIsOrientationChanged = false;
         cancelEnrollment();
         stopIconAnimation();
@@ -1040,6 +1045,7 @@
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        maybeHideSfpsText(newConfig);
         switch(newConfig.orientation) {
             case Configuration.ORIENTATION_LANDSCAPE: {
                 updateOrientation(Configuration.ORIENTATION_LANDSCAPE);
@@ -1055,6 +1061,27 @@
         }
     }
 
+    private void maybeHideSfpsText(@NonNull Configuration newConfig) {
+        final HeaderMixin headerMixin = getLayout().getMixin(HeaderMixin.class);
+        final DescriptionMixin descriptionMixin = getLayout().getMixin(DescriptionMixin.class);
+        final boolean isLandscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE;
+
+        if (mCanAssumeSfps) {
+            if (isLandscape) {
+                headerMixin.setAutoTextSizeEnabled(true);
+                headerMixin.getTextView().setMinLines(0);
+                headerMixin.getTextView().setMaxLines(10);
+                descriptionMixin.getTextView().setMinLines(0);
+                descriptionMixin.getTextView().setMaxLines(10);
+            } else {
+                headerMixin.setAutoTextSizeEnabled(false);
+                headerMixin.getTextView().setLines(4);
+                // hide the description
+                descriptionMixin.getTextView().setLines(0);
+            }
+        }
+    }
+
     public static class IconTouchDialog extends InstrumentedDialogFragment {
 
         @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index faf4df7..200b8c5 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -317,7 +317,7 @@
         if (mNextClicked && errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
             proceedToEnrolling(false /* cancelEnrollment */);
         } else {
-            FingerprintErrorDialog.showErrorDialog(this, errMsgId);
+            FingerprintErrorDialog.showErrorDialog(this, errMsgId, mCanAssumeUdfps);
         }
     }
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index b8ec5e6..2125d52 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -132,12 +132,12 @@
     @Override
     protected void onNextButtonClick(View view) {
         updateFingerprintSuggestionEnableState();
-        finishAndToNext();
+        finishAndToNext(RESULT_FINISHED);
     }
 
-    private void finishAndToNext() {
+    private void finishAndToNext(int resultCode) {
         mIsAddAnotherOrFinish = true;
-        setResult(RESULT_FINISHED);
+        setResult(resultCode);
         if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
             postEnroll();
         }
@@ -184,9 +184,12 @@
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         updateFingerprintSuggestionEnableState();
-        if (requestCode == BiometricUtils.REQUEST_ADD_ANOTHER && resultCode != RESULT_CANCELED) {
+        if (requestCode == BiometricUtils.REQUEST_ADD_ANOTHER && resultCode == RESULT_TIMEOUT) {
+            finishAndToNext(resultCode);
+        } else if (requestCode == BiometricUtils.REQUEST_ADD_ANOTHER
+                && resultCode != RESULT_CANCELED) {
             // If user cancel during "Add another", just use similar flow on "Next" button
-            finishAndToNext();
+            finishAndToNext(RESULT_FINISHED);
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
index 39d35dc..dc1189c 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
@@ -41,12 +41,14 @@
 
     public static final String KEY_ERROR_MSG = "error_msg";
     public static final String KEY_ERROR_ID = "error_id";
+    public static final String KEY_UDFPS = "is_udfps";
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         CharSequence errorString = getArguments().getCharSequence(KEY_ERROR_MSG);
         final int errMsgId = getArguments().getInt(KEY_ERROR_ID);
+        final boolean canAssumeUdfps = getArguments().getBoolean(KEY_UDFPS, false);
         boolean wasTimeout = errMsgId == BiometricConstants.BIOMETRIC_ERROR_TIMEOUT;
 
         builder.setTitle(R.string.security_settings_fingerprint_enroll_error_dialog_title)
@@ -59,11 +61,15 @@
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
                                 Activity activity = getActivity();
-                                activity.setResult(RESULT_FINISHED);
+                                if (wasTimeout && !canAssumeUdfps) {
+                                    activity.setResult(RESULT_TIMEOUT);
+                                } else {
+                                    activity.setResult(RESULT_FINISHED);
+                                }
                                 activity.finish();
                             }
                         });
-        if (wasTimeout) {
+        if (wasTimeout && canAssumeUdfps) {
             builder.setPositiveButton(
                             R.string.security_settings_fingerprint_enroll_dialog_try_again,
                             new DialogInterface.OnClickListener() {
@@ -95,18 +101,21 @@
         return dialog;
     }
 
-    public static void showErrorDialog(BiometricEnrollBase host, int errMsgId) {
+    public static void showErrorDialog(BiometricEnrollBase host, int errMsgId,
+            boolean canAssumeUdfps) {
         if (host.isFinishing()) {
             return;
         }
-
         final FragmentManager fragmentManager = host.getSupportFragmentManager();
         if (fragmentManager.isDestroyed() || fragmentManager.isStateSaved()) {
             return;
         }
-
-        final CharSequence errMsg = host.getText(getErrorMessage(errMsgId));
-        final FingerprintErrorDialog dialog = newInstance(errMsg, errMsgId);
+        CharSequence errMsg = host.getText(getErrorMessage(errMsgId));
+        if (!canAssumeUdfps
+                && errMsgId == BiometricConstants.BIOMETRIC_ERROR_TIMEOUT) {
+            errMsg = host.getText(getErrorMessage(BiometricConstants.BIOMETRIC_ERROR_CANCELED));
+        }
+        final FingerprintErrorDialog dialog = newInstance(errMsg, errMsgId, canAssumeUdfps);
         dialog.show(fragmentManager, FingerprintErrorDialog.class.getName());
     }
 
@@ -124,11 +133,13 @@
         }
     }
 
-    private static FingerprintErrorDialog newInstance(CharSequence msg, int msgId) {
+    private static FingerprintErrorDialog newInstance(CharSequence msg, int msgId,
+            boolean canAssumeUdfps) {
         FingerprintErrorDialog dialog = new FingerprintErrorDialog();
         Bundle args = new Bundle();
         args.putCharSequence(KEY_ERROR_MSG, msg);
         args.putInt(KEY_ERROR_ID, msgId);
+        args.putBoolean(KEY_UDFPS, canAssumeUdfps);
         dialog.setArguments(args);
         return dialog;
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 2cbef99..8ba2010 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -53,6 +53,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
@@ -158,6 +159,8 @@
         private static final String KEY_IS_ENROLLING = "is_enrolled";
         private static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
                 "security_settings_require_screen_on_to_auth";
+        private static final String KEY_FINGERPRINT_UNLOCK_CATEGORY =
+                "security_settings_fingerprint_unlock_category";
 
         private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
         private static final int MSG_FINGER_AUTH_SUCCESS = 1001;
@@ -177,6 +180,7 @@
         private FingerprintSettingsRequireScreenOnToAuthPreferenceController
                 mRequireScreenOnToAuthPreferenceController;
         private RestrictedSwitchPreference mRequireScreenOnToAuthPreference;
+        private PreferenceCategory mFingerprintUnlockCategory;
 
         private FingerprintManager mFingerprintManager;
         private FingerprintUpdater mFingerprintUpdater;
@@ -493,6 +497,7 @@
             addFingerprintItemPreferences(root);
             addPreferencesFromResource(getPreferenceScreenResId());
             mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);
+            mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
             for (AbstractPreferenceController controller : mControllers) {
                 ((FingerprintSettingsPreferenceController) controller).setUserId(mUserId);
             }
@@ -504,7 +509,7 @@
                         mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked);
                         return true;
                     });
-            mRequireScreenOnToAuthPreference.setVisible(false);
+            mFingerprintUnlockCategory.setVisible(false);
             if (isSfps()) {
                 setRequireScreenOnToAuthVisibility();
             }
@@ -517,9 +522,9 @@
             final boolean removalInProgress = mRemovalSidecar.inProgress();
             // Removing last remaining fingerprint
             if (fingerprintsEnrolled == 0 && removalInProgress) {
-                mRequireScreenOnToAuthPreference.setVisible(false);
+                mFingerprintUnlockCategory.setVisible(false);
             } else {
-                mRequireScreenOnToAuthPreference.setVisible(true);
+                mFingerprintUnlockCategory.setVisible(true);
             }
         }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
index 3bf9132..ca27299 100644
--- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -45,6 +45,7 @@
     private SwitchWidgetController mSwitch;
     private Context mContext;
     private FooterPreference mFooterPreference;
+    private boolean mIsAlwaysDiscoverable;
 
     @VisibleForTesting
     AlwaysDiscoverable mAlwaysDiscoverable;
@@ -78,7 +79,9 @@
     @Override
     public void onStart() {
         mBluetoothEnabler.resume(mContext);
-        mAlwaysDiscoverable.start();
+        if (mIsAlwaysDiscoverable) {
+            mAlwaysDiscoverable.start();
+        }
         if (mSwitch != null) {
             updateText(mSwitch.isChecked());
         }
@@ -87,7 +90,19 @@
     @Override
     public void onStop() {
         mBluetoothEnabler.pause();
-        mAlwaysDiscoverable.stop();
+        if (mIsAlwaysDiscoverable) {
+            mAlwaysDiscoverable.stop();
+        }
+    }
+
+    /**
+     * Set whether the device can be discovered. By default the value will be {@code false}.
+     *
+     * @param isAlwaysDiscoverable {@code true} if the device can be discovered,
+     *     otherwise {@code false}
+     */
+    public void setAlwaysDiscoverable(boolean isAlwaysDiscoverable) {
+        mIsAlwaysDiscoverable = isAlwaysDiscoverable;
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 4591b7f..b30aee4 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -18,12 +18,17 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController;
 import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.password.PasswordUtils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.MainSwitchBarController;
 import com.android.settings.widget.SettingsMainSwitchBar;
@@ -40,6 +45,10 @@
 
     private static final String TAG = "BluetoothDashboardFrag";
     private static final String KEY_BLUETOOTH_SCREEN_FOOTER = "bluetooth_screen_footer";
+    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private FooterPreference mFooterPreference;
     private SettingsMainSwitchBar mSwitchBar;
@@ -80,17 +89,33 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        String callingAppPackageName = PasswordUtils.getCallingAppPackageName(
+                getActivity().getActivityToken());
+        String action = getIntent() != null ? getIntent().getAction() : "";
+        if (DEBUG) {
+            Log.d(TAG, "onActivityCreated() calling package name is : " + callingAppPackageName
+                    + ", action : " + action);
+        }
 
         SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
         mSwitchBar.setTitle(getContext().getString(R.string.bluetooth_main_switch_title));
         mController = new BluetoothSwitchPreferenceController(activity,
                 new MainSwitchBarController(mSwitchBar), mFooterPreference);
+        mController.setAlwaysDiscoverable(isAlwaysDiscoverable(callingAppPackageName, action));
         Lifecycle lifecycle = getSettingsLifecycle();
         if (lifecycle != null) {
             lifecycle.addObserver(mController);
         }
     }
+
+    @VisibleForTesting
+    boolean isAlwaysDiscoverable(String callingAppPackageName, String action) {
+        return TextUtils.equals(SLICE_ACTION, action) ? false
+            : TextUtils.equals(SETTINGS_PACKAGE_NAME, callingAppPackageName)
+                || TextUtils.equals(SYSTEMUI_PACKAGE_NAME, callingAppPackageName);
+    }
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index c39f384..7203d8a 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -46,6 +46,7 @@
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.template.HeaderMixin;
 import com.google.android.setupdesign.util.ThemeHelper;
 import com.google.android.setupdesign.util.ThemeResolver;
 
@@ -167,7 +168,9 @@
 
     protected void setHeaderText(int resId, CharSequence... args) {
         final CharSequence headerText = TextUtils.expandTemplate(getText(resId), args);
-        getGlifLayout().setHeaderText(headerText);
+        final GlifLayout layout = getGlifLayout();
+        layout.setHeaderText(headerText);
+        layout.getMixin(HeaderMixin.class).setAutoTextSizeEnabled(false);
         setTitle(headerText);
     }
 
diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index de1aaea..d6fef11 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -39,9 +39,10 @@
     public boolean isAvailable() {
         final boolean dreamsSupported = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported);
-        final boolean dreamsOnlyEnabledForSystemUser = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser);
-        return dreamsSupported && (!dreamsOnlyEnabledForSystemUser || isSystemUser());
+        final boolean dreamsOnlyEnabledForDockUser = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
+        // TODO(b/257333623): Allow the Dock User to be non-SystemUser user in HSUM.
+        return dreamsSupported && (!dreamsOnlyEnabledForDockUser || isSystemUser());
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 436cde8..558e0bf 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -28,7 +28,6 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.Utils;
-import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -135,6 +134,5 @@
                 mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_SAVER);
             }
         }
-        BatteryFixSlice.updateBatteryTipAvailabilityCache(mContext);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
index 067fcf9..81142c2 100644
--- a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
+++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
@@ -50,12 +50,6 @@
                         .setCardName(CustomSliceRegistry.LOW_STORAGE_SLICE_URI.toString())
                         .setCardCategory(ContextualCard.Category.IMPORTANT)
                         .build();
-        final ContextualCard batteryFixCard =
-                ContextualCard.newBuilder()
-                        .setSliceUri(CustomSliceRegistry.BATTERY_FIX_SLICE_URI.toString())
-                        .setCardName(CustomSliceRegistry.BATTERY_FIX_SLICE_URI.toString())
-                        .setCardCategory(ContextualCard.Category.IMPORTANT)
-                        .build();
         final String contextualAdaptiveSleepSliceUri =
                 CustomSliceRegistry.CONTEXTUAL_ADAPTIVE_SLEEP_URI.toString();
         final ContextualCard contextualAdaptiveSleepCard =
@@ -80,7 +74,6 @@
                 .addCard(wifiCard)
                 .addCard(connectedDeviceCard)
                 .addCard(lowStorageCard)
-                .addCard(batteryFixCard)
                 .addCard(contextualAdaptiveSleepCard)
                 .addCard(contextualFaceSettingsCard)
                 .addCard(darkThemeCard)
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
deleted file mode 100644
index 33dcd4e..0000000
--- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (C) 2018 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.homepage.contextualcards.slices;
-
-import static android.content.Context.MODE_PRIVATE;
-
-import static com.android.settings.slices.CustomSliceRegistry.BATTERY_FIX_SLICE_URI;
-
-import android.app.PendingIntent;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.BatteryUsageStats;
-import android.util.ArrayMap;
-import android.view.View;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.ListBuilder.RowBuilder;
-import androidx.slice.builders.SliceAction;
-
-import com.android.settings.R;
-import com.android.settings.SubSettings;
-import com.android.settings.Utils;
-import com.android.settings.fuelgauge.batterytip.BatteryTipLoader;
-import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
-import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.fuelgauge.batteryusage.BatteryUsageStatsLoader;
-import com.android.settings.fuelgauge.batteryusage.PowerUsageSummary;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settings.slices.SliceBuilderUtils;
-import com.android.settingslib.utils.ThreadUtils;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-public class BatteryFixSlice implements CustomSliceable {
-
-    @VisibleForTesting
-    static final String PREFS = "battery_fix_prefs";
-    @VisibleForTesting
-    static final String KEY_CURRENT_TIPS_TYPE = "current_tip_type";
-    static final String KEY_CURRENT_TIPS_STATE = "current_tip_state";
-
-    // A map tracking which BatteryTip and which state of that tip is not important.
-    private static final Map<Integer, List<Integer>> UNIMPORTANT_BATTERY_TIPS;
-
-    static {
-        UNIMPORTANT_BATTERY_TIPS = new ArrayMap<>();
-        UNIMPORTANT_BATTERY_TIPS.put(BatteryTip.TipType.SUMMARY,
-                Arrays.asList(BatteryTip.StateType.NEW, BatteryTip.StateType.HANDLED));
-        UNIMPORTANT_BATTERY_TIPS.put(BatteryTip.TipType.HIGH_DEVICE_USAGE,
-                Arrays.asList(BatteryTip.StateType.NEW, BatteryTip.StateType.HANDLED));
-        UNIMPORTANT_BATTERY_TIPS.put(BatteryTip.TipType.BATTERY_SAVER,
-                Arrays.asList(BatteryTip.StateType.HANDLED));
-    }
-
-    private static final String TAG = "BatteryFixSlice";
-
-    private final Context mContext;
-
-    public BatteryFixSlice(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public Uri getUri() {
-        return BATTERY_FIX_SLICE_URI;
-    }
-
-    @Override
-    public Slice getSlice() {
-        final ListBuilder sliceBuilder =
-                new ListBuilder(mContext, BATTERY_FIX_SLICE_URI, ListBuilder.INFINITY)
-                        .setAccentColor(COLOR_NOT_TINTED);
-
-        if (!isBatteryTipAvailableFromCache(mContext)) {
-            return buildBatteryGoodSlice(sliceBuilder, true /* isError */);
-        }
-
-        final SliceBackgroundWorker worker = SliceBackgroundWorker.getInstance(getUri());
-        final List<BatteryTip> batteryTips = worker != null ? worker.getResults() : null;
-
-        if (batteryTips == null) {
-            // Because we need wait slice background worker return data
-            return buildBatteryGoodSlice(sliceBuilder, false /* isError */);
-        }
-
-        for (BatteryTip batteryTip : batteryTips) {
-            if (batteryTip.getState() == BatteryTip.StateType.INVISIBLE) {
-                continue;
-            }
-            final Drawable drawable = mContext.getDrawable(batteryTip.getIconId());
-            final int iconTintColorId = batteryTip.getIconTintColorId();
-            if (iconTintColorId != View.NO_ID) {
-                drawable.setColorFilter(new PorterDuffColorFilter(
-                        mContext.getResources().getColor(iconTintColorId),
-                        PorterDuff.Mode.SRC_IN));
-            }
-
-            final IconCompat icon = Utils.createIconWithDrawable(drawable);
-            final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(),
-                    icon,
-                    ListBuilder.ICON_IMAGE,
-                    batteryTip.getTitle(mContext));
-            sliceBuilder.addRow(new RowBuilder()
-                    .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                    .setTitle(batteryTip.getTitle(mContext))
-                    .setSubtitle(batteryTip.getSummary(mContext))
-                    .setPrimaryAction(primaryAction));
-            break;
-        }
-        return sliceBuilder.build();
-    }
-
-    @Override
-    public Intent getIntent() {
-        final String screenTitle = mContext.getText(R.string.power_usage_summary_title)
-                .toString();
-        final Uri contentUri = new Uri.Builder()
-                .appendPath(BatteryTipPreferenceController.PREF_NAME).build();
-
-        return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
-                PowerUsageSummary.class.getName(), BatteryTipPreferenceController.PREF_NAME,
-                screenTitle,
-                SettingsEnums.SLICE,
-                this)
-                .setClassName(mContext.getPackageName(), SubSettings.class.getName())
-                .setData(contentUri);
-    }
-
-    @Override
-    public int getSliceHighlightMenuRes() {
-        return R.string.menu_key_battery;
-    }
-
-    @Override
-    public void onNotifyChange(Intent intent) {
-    }
-
-    @Override
-    public Class getBackgroundWorkerClass() {
-        return BatteryTipWorker.class;
-    }
-
-    private PendingIntent getPrimaryAction() {
-        final Intent intent = getIntent();
-        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent,
-                PendingIntent.FLAG_IMMUTABLE);
-    }
-
-    private Slice buildBatteryGoodSlice(ListBuilder sliceBuilder, boolean isError) {
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_battery_status_good_24dp);
-        final String title = mContext.getString(R.string.power_usage_summary_title);
-        final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,
-                ListBuilder.ICON_IMAGE, title);
-        sliceBuilder.addRow(new RowBuilder()
-                .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                .setTitle(title)
-                .setPrimaryAction(primaryAction))
-                .setIsError(isError);
-        return sliceBuilder.build();
-    }
-
-    // TODO(b/114807643): we should find a better way to get current battery tip type quickly
-    // Now we save battery tip type to shared preference when battery level changes
-    public static void updateBatteryTipAvailabilityCache(Context context) {
-        ThreadUtils.postOnBackgroundThread(() -> refreshBatteryTips(context));
-    }
-
-
-    @VisibleForTesting
-    static boolean isBatteryTipAvailableFromCache(Context context) {
-        final SharedPreferences prefs = context.getSharedPreferences(PREFS, MODE_PRIVATE);
-
-        final int type = prefs.getInt(KEY_CURRENT_TIPS_TYPE, BatteryTip.TipType.SUMMARY);
-        final int state = prefs.getInt(KEY_CURRENT_TIPS_STATE, BatteryTip.StateType.INVISIBLE);
-        if (state == BatteryTip.StateType.INVISIBLE) {
-            // State is INVISIBLE, We should not show anything.
-            return false;
-        }
-        final boolean unimportant = UNIMPORTANT_BATTERY_TIPS.containsKey(type)
-                && UNIMPORTANT_BATTERY_TIPS.get(type).contains(state);
-        return !unimportant;
-    }
-
-    @WorkerThread
-    @VisibleForTesting
-    static List<BatteryTip> refreshBatteryTips(Context context) {
-        final BatteryUsageStatsLoader statsLoader = new BatteryUsageStatsLoader(context,
-                /* includeBatteryHistory */ false);
-        final BatteryUsageStats batteryUsageStats = statsLoader.loadInBackground();
-        final BatteryTipLoader loader = new BatteryTipLoader(context, batteryUsageStats);
-        final List<BatteryTip> batteryTips = loader.loadInBackground();
-        for (BatteryTip batteryTip : batteryTips) {
-            if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) {
-                context.getSharedPreferences(PREFS, MODE_PRIVATE)
-                        .edit()
-                        .putInt(KEY_CURRENT_TIPS_TYPE, batteryTip.getType())
-                        .putInt(KEY_CURRENT_TIPS_STATE, batteryTip.getState())
-                        .apply();
-                break;
-            }
-        }
-        return batteryTips;
-    }
-
-    public static class BatteryTipWorker extends SliceBackgroundWorker<BatteryTip> {
-
-        private final Context mContext;
-
-        public BatteryTipWorker(Context context, Uri uri) {
-            super(context, uri);
-            mContext = context;
-        }
-
-        @Override
-        protected void onSlicePinned() {
-            ThreadUtils.postOnBackgroundThread(() -> {
-                final List<BatteryTip> batteryTips = refreshBatteryTips(mContext);
-                updateResults(batteryTips);
-            });
-        }
-
-        @Override
-        protected void onSliceUnpinned() {
-        }
-
-        @Override
-        public void close() {
-        }
-    }
-}
diff --git a/src/com/android/settings/overlay/SurveyFeatureProvider.java b/src/com/android/settings/overlay/SurveyFeatureProvider.java
index 44ee525..ce5be98 100644
--- a/src/com/android/settings/overlay/SurveyFeatureProvider.java
+++ b/src/com/android/settings/overlay/SurveyFeatureProvider.java
@@ -26,14 +26,15 @@
  * An interface for classes wishing to provide the ability to serve surveys to implement.
  */
 public interface SurveyFeatureProvider {
-
     /**
      * Downloads a survey asynchronously to shared preferences to be served at a later date.
      *
      * @param activity A valid context.
      * @param surveyId A unique Id representing a survey to download.
-     * @param data a text blob to be attached to the survey results.
+     * @param data     a text blob to be attached to the survey results.
+     * @deprecated This is not used after T.
      */
+    @Deprecated
     void downloadSurvey(Activity activity, String surveyId, @Nullable String data);
 
     /**
@@ -42,17 +43,21 @@
      * @param activity The host activity to show the survey in.
      * @param surveyId A unique Id representing a survey to download.
      * @return A boolean indicating if a survey was shown or not.
+     * @deprecated This is not used after T.
      */
+    @Deprecated
     boolean showSurveyIfAvailable(Activity activity, String surveyId);
 
     /**
      * A helper method to get the surveyId. Implementers should create a mapping of
      * keys to surveyIds and provide them via this function.
      *
-     * @param context A valid context.
+     * @param context   A valid context.
      * @param simpleKey The simple name of the key to get the surveyId for.
      * @return The unique Id as a string or null on error.
+     * @deprecated This is not used after T.
      */
+    @Deprecated
     String getSurveyId(Context context, String simpleKey);
 
     /**
@@ -60,28 +65,36 @@
      * unix timestamp) for the remaining survey should it exist and be ready to show. Returns -1 if
      * no valid survey exists after removing the potentially expired one.
      *
-     * @param context the calling context.
+     * @param context  the calling context.
      * @param surveyId the site ID.
      * @return the unix timestamp for the available survey for the given {@coe siteId} or -1 if
      * there is none available.
+     * @deprecated This is not used after T.
      */
+    @Deprecated
     long getSurveyExpirationDate(Context context, String surveyId);
 
     /**
      * Registers an activity to show surveys/prompts as soon as they are downloaded. The receiver
      * should be unregistered prior to destroying the activity to avoid undefined behavior by
      * calling {@link #unregisterReceiver(Activity, BroadcastReceiver)}.
+     *
      * @param activity The activity that should show surveys once they are downloaded.
      * @return the broadcast receiver listening for survey downloads. Must be unregistered before
      * leaving the activity.
+     * @deprecated This is not used after T.
      */
+    @Deprecated
     BroadcastReceiver createAndRegisterReceiver(Activity activity);
 
     /**
      * Unregisters the broadcast receiver for this activity. Should only be called once per activity
      * after a call to {@link #createAndRegisterReceiver(Activity)}.
+     *
      * @param activity The activity that was used to register the BroadcastReceiver.
+     * @deprecated This is not used after T.
      */
+    @Deprecated
     static void unregisterReceiver(Activity activity, BroadcastReceiver receiver) {
         if (activity == null) {
             throw new IllegalStateException("Cannot unregister receiver if activity is null");
@@ -89,4 +102,11 @@
 
         LocalBroadcastManager.getInstance(activity).unregisterReceiver(receiver);
     }
+
+    /**
+     * Send the visited activity to the place where it will trigger a survey if possible.
+     *
+     * @param simpleKey The simple name of the key to get the surveyId for.
+     */
+    void sendActivityIfAvailable(String simpleKey);
 }
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index 569a0ea..c49d622 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -29,8 +29,6 @@
 import com.android.settings.display.AlwaysOnDisplaySlice;
 import com.android.settings.display.ScreenTimeoutPreferenceController;
 import com.android.settings.flashlight.FlashlightSlice;
-import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
-import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice;
 import com.android.settings.homepage.contextualcards.slices.BluetoothDevicesSlice;
 import com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice;
 import com.android.settings.homepage.contextualcards.slices.DarkThemeSlice;
@@ -65,16 +63,6 @@
             .build();
 
     /**
-     * Uri for Battery Fix Slice.
-     */
-    public static final Uri BATTERY_FIX_SLICE_URI = new Uri.Builder()
-            .scheme(ContentResolver.SCHEME_CONTENT)
-            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-            .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_INTENT)
-            .appendPath(BatteryTipPreferenceController.PREF_NAME)
-            .build();
-
-    /**
      * Backing Uri for the Bluetooth Slice.
      */
     public static final Uri BLUETOOTH_URI = new Uri.Builder()
@@ -331,7 +319,6 @@
     static {
         sUriToSlice = new ArrayMap<>();
 
-        sUriToSlice.put(BATTERY_FIX_SLICE_URI, BatteryFixSlice.class);
         sUriToSlice.put(BLUETOOTH_DEVICES_SLICE_URI, BluetoothDevicesSlice.class);
         sUriToSlice.put(CONTEXTUAL_ADAPTIVE_SLEEP_URI, ContextualAdaptiveSleepSlice.class);
         sUriToSlice.put(CONTEXTUAL_WIFI_SLICE_URI, ContextualWifiSlice.class);
diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java
index 5de2653..2f68de6 100644
--- a/src/com/android/settings/survey/SurveyMixin.java
+++ b/src/com/android/settings/survey/SurveyMixin.java
@@ -16,14 +16,12 @@
 package com.android.settings.survey;
 
 import android.app.Activity;
-import android.content.BroadcastReceiver;
 
 import androidx.fragment.app.Fragment;
 
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SurveyFeatureProvider;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
@@ -31,17 +29,17 @@
  * in settings. This allows new classes to automatically support settings provided the extend
  * one of the relevant classes in com.android.settings.lifecycle.
  */
-public class SurveyMixin implements LifecycleObserver, OnResume, OnPause {
+public class SurveyMixin implements LifecycleObserver, OnResume {
 
     private String mName;
     private Fragment mFragment;
-    private BroadcastReceiver mReceiver;
 
     /**
      * A mixin that attempts to perform survey related tasks right before onResume is called
      * in a Settings PreferenceFragment. This will allow for remote updating and creation of
      * surveys.
-     * @param fragment The fragment that this mixin will be attached to.
+     *
+     * @param fragment     The fragment that this mixin will be attached to.
      * @param fragmentName The simple name of the fragment.
      */
     public SurveyMixin(Fragment fragment, String fragmentName) {
@@ -53,31 +51,13 @@
     public void onResume() {
         Activity activity = mFragment.getActivity();
 
-        // guard against the activity not existing yet or the feature being disabled
+        // guard against the activity not existing yet
         if (activity != null) {
             SurveyFeatureProvider provider =
                     FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);
             if (provider != null) {
-
-                // Try to download a survey if there is none available, show the survey otherwise
-                String id = provider.getSurveyId(activity, mName);
-                if (provider.getSurveyExpirationDate(activity, id) <= -1) {
-                    // register the receiver to show the survey on completion.
-                    mReceiver = provider.createAndRegisterReceiver(activity);
-                    provider.downloadSurvey(activity, id, null /* data */);
-                } else {
-                    provider.showSurveyIfAvailable(activity, id);
-                }
+                provider.sendActivityIfAvailable(mName);
             }
         }
     }
-
-    @Override
-    public void onPause() {
-        Activity activity = mFragment.getActivity();
-        if (mReceiver != null && activity != null) {
-            SurveyFeatureProvider.unregisterReceiver(activity, mReceiver);
-            mReceiver = null;
-        }
-    }
 }
diff --git a/src/com/android/settings/users/TimeoutToUserZeroPreferenceController.java b/src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
similarity index 79%
rename from src/com/android/settings/users/TimeoutToUserZeroPreferenceController.java
rename to src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
index c332726..98dca2a 100644
--- a/src/com/android/settings/users/TimeoutToUserZeroPreferenceController.java
+++ b/src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.users;
 
-import static android.provider.Settings.Secure.TIMEOUT_TO_USER_ZERO;
+import static android.provider.Settings.Secure.TIMEOUT_TO_DOCK_USER;
 
 import android.content.Context;
 import android.os.UserHandle;
@@ -30,20 +30,20 @@
 
 /**
  * Controls the preference which launches a settings screen for user to configure whether to
- * automatically switch to the admin user when the device is docked.
+ * automatically switch to the designated Dock User when the device is docked.
  */
-public class TimeoutToUserZeroPreferenceController extends BasePreferenceController {
+public class TimeoutToDockUserPreferenceController extends BasePreferenceController {
     private final String[] mEntries;
     private final String[] mValues;
 
-    public TimeoutToUserZeroPreferenceController(Context context,
+    public TimeoutToDockUserPreferenceController(Context context,
             String preferenceKey) {
         super(context, preferenceKey);
 
         mEntries = mContext.getResources().getStringArray(
-                com.android.settings.R.array.switch_to_user_zero_when_docked_timeout_entries);
+                com.android.settings.R.array.switch_to_dock_user_when_docked_timeout_entries);
         mValues = mContext.getResources().getStringArray(
-                com.android.settings.R.array.switch_to_user_zero_when_docked_timeout_values);
+                com.android.settings.R.array.switch_to_dock_user_when_docked_timeout_values);
     }
 
     @Override
@@ -57,7 +57,7 @@
     public int getAvailabilityStatus() {
         // Feature not available on device.
         if (!mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_enableTimeoutToUserZeroWhenDocked)) {
+                com.android.internal.R.bool.config_enableTimeoutToDockUserWhenDocked)) {
             return UNSUPPORTED_ON_DEVICE;
         }
 
@@ -68,6 +68,7 @@
         }
 
         // Is currently user zero. Only non user zero can have this setting.
+        // TODO(b/257333623): Allow the Dock User to be non-SystemUser user in HSUM.
         if (UserHandle.myUserId() == UserHandle.USER_SYSTEM) {
             return DISABLED_FOR_USER;
         }
@@ -78,9 +79,9 @@
     @Override
     public CharSequence getSummary() {
         final String key = Settings.Secure.getStringForUser(mContext.getContentResolver(),
-                TIMEOUT_TO_USER_ZERO, UserHandle.myUserId());
+                TIMEOUT_TO_DOCK_USER, UserHandle.myUserId());
         final int index = Arrays.asList(mValues).indexOf(key != null ? key :
-                mValues[TimeoutToUserZeroSettings.DEFAULT_TIMEOUT_SETTING_VALUE_INDEX]);
+                mValues[TimeoutToDockUserSettings.DEFAULT_TIMEOUT_SETTING_VALUE_INDEX]);
 
         return mEntries[index];
     }
diff --git a/src/com/android/settings/users/TimeoutToUserZeroSettings.java b/src/com/android/settings/users/TimeoutToDockUserSettings.java
similarity index 86%
rename from src/com/android/settings/users/TimeoutToUserZeroSettings.java
rename to src/com/android/settings/users/TimeoutToDockUserSettings.java
index 7621ce5..bb61b67 100644
--- a/src/com/android/settings/users/TimeoutToUserZeroSettings.java
+++ b/src/com/android/settings/users/TimeoutToDockUserSettings.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.users;
 
-import static android.provider.Settings.Secure.TIMEOUT_TO_USER_ZERO;
+import static android.provider.Settings.Secure.TIMEOUT_TO_DOCK_USER;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -33,9 +33,9 @@
 
 /**
  * Setting screen that lists options for users to configure whether to automatically switch to the
- * admin user when the device is docked, and if so duration of the timeout.
+ * Dock User when the device is docked, and if so duration of the timeout.
  */
-public class TimeoutToUserZeroSettings extends RadioButtonPickerFragment {
+public class TimeoutToDockUserSettings extends RadioButtonPickerFragment {
     // Index of the default key of the timeout setting if it hasn't been changed by the user.
     public static final int DEFAULT_TIMEOUT_SETTING_VALUE_INDEX = 0;
 
@@ -52,7 +52,7 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.user_timeout_to_user_zero_settings;
+        return R.xml.user_timeout_to_dock_user_settings;
     }
 
     @Override
@@ -60,9 +60,9 @@
         super.onAttach(context);
 
         mEntries = getContext().getResources().getStringArray(
-                R.array.switch_to_user_zero_when_docked_timeout_entries);
+                R.array.switch_to_dock_user_when_docked_timeout_entries);
         mValues = getContext().getResources().getStringArray(
-                R.array.switch_to_user_zero_when_docked_timeout_values);
+                R.array.switch_to_dock_user_when_docked_timeout_values);
     }
 
     @Override
@@ -83,13 +83,13 @@
     @Override
     protected String getDefaultKey() {
         final String defaultKey = Settings.Secure.getStringForUser(
-                getContext().getContentResolver(), TIMEOUT_TO_USER_ZERO, UserHandle.myUserId());
+                getContext().getContentResolver(), TIMEOUT_TO_DOCK_USER, UserHandle.myUserId());
         return defaultKey != null ? defaultKey : mValues[DEFAULT_TIMEOUT_SETTING_VALUE_INDEX];
     }
 
     @Override
     protected boolean setDefaultKey(String key) {
-        Settings.Secure.putStringForUser(getContext().getContentResolver(), TIMEOUT_TO_USER_ZERO,
+        Settings.Secure.putStringForUser(getContext().getContentResolver(), TIMEOUT_TO_DOCK_USER,
                 key, UserHandle.myUserId());
         return true;
     }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 4aa7f44..0ae7fa1 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -125,7 +125,7 @@
     private static final String KEY_ADD_SUPERVISED_USER = "supervised_user_add";
     private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
     private static final String KEY_MULTIUSER_TOP_INTRO = "multiuser_top_intro";
-    private static final String KEY_TIMEOUT_TO_USER_ZERO = "timeout_to_user_zero_preference";
+    private static final String KEY_TIMEOUT_TO_DOCK_USER = "timeout_to_dock_user_preference";
     private static final String KEY_GUEST_CATEGORY = "guest_category";
     private static final String KEY_GUEST_RESET = "guest_reset";
     private static final String KEY_GUEST_EXIT = "guest_exit";
@@ -213,7 +213,7 @@
     private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
     private RemoveGuestOnExitPreferenceController mRemoveGuestOnExitPreferenceController;
     private MultiUserTopIntroPreferenceController mMultiUserTopIntroPreferenceController;
-    private TimeoutToUserZeroPreferenceController mTimeoutToUserZeroPreferenceController;
+    private TimeoutToDockUserPreferenceController mTimeoutToDockUserPreferenceController;
     private UserCreatingDialog mUserCreatingDialog;
     private final AtomicBoolean mGuestCreationScheduled = new AtomicBoolean();
     private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
@@ -306,14 +306,14 @@
         mMultiUserTopIntroPreferenceController = new MultiUserTopIntroPreferenceController(activity,
                 KEY_MULTIUSER_TOP_INTRO);
 
-        mTimeoutToUserZeroPreferenceController = new TimeoutToUserZeroPreferenceController(activity,
-                KEY_TIMEOUT_TO_USER_ZERO);
+        mTimeoutToDockUserPreferenceController = new TimeoutToDockUserPreferenceController(
+                activity, KEY_TIMEOUT_TO_DOCK_USER);
 
         final PreferenceScreen screen = getPreferenceScreen();
         mAddUserWhenLockedPreferenceController.displayPreference(screen);
         mRemoveGuestOnExitPreferenceController.displayPreference(screen);
         mMultiUserTopIntroPreferenceController.displayPreference(screen);
-        mTimeoutToUserZeroPreferenceController.displayPreference(screen);
+        mTimeoutToDockUserPreferenceController.displayPreference(screen);
 
         screen.findPreference(mAddUserWhenLockedPreferenceController.getPreferenceKey())
                 .setOnPreferenceChangeListener(mAddUserWhenLockedPreferenceController);
@@ -387,8 +387,8 @@
 
         mAddUserWhenLockedPreferenceController.updateState(screen.findPreference(
                 mAddUserWhenLockedPreferenceController.getPreferenceKey()));
-        mTimeoutToUserZeroPreferenceController.updateState(screen.findPreference(
-                mTimeoutToUserZeroPreferenceController.getPreferenceKey()));
+        mTimeoutToDockUserPreferenceController.updateState(screen.findPreference(
+                mTimeoutToDockUserPreferenceController.getPreferenceKey()));
         mRemoveGuestOnExitPreferenceController.updateState(screen.findPreference(
                 mRemoveGuestOnExitPreferenceController.getPreferenceKey()));
         if (mShouldUpdateUserList) {
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
index 04db527..61017f7 100644
--- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -41,7 +41,6 @@
 import android.widget.ImageView;
 
 import com.android.settings.homepage.SettingsHomepageActivity;
-import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
 import org.junit.Before;
@@ -95,7 +94,6 @@
     }
 
     @Test
-    @Config(shadows = BatteryFixSliceTest.ShadowBatteryTipLoader.class)
     public void onStart_useMockAvatarViewMixin_shouldBeExecuted() {
         final AvatarViewMixin mockAvatar = spy(new AvatarViewMixin(mActivity, mImageView));
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
index 3c5a91d..50c82d3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
@@ -18,13 +18,14 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.provider.Settings;
-
 import android.text.TextUtils;
+
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.utils.AnnotationSpan;
@@ -109,16 +110,34 @@
     }
 
     @Test
-    public void onStart_shouldStartAlwaysDiscoverable() {
+    public void onStart_setAlwaysDiscoverableAsTrue_shouldStartAlwaysDiscoverable() {
+        mController.setAlwaysDiscoverable(true);
         mController.onStart();
 
         verify(mAlwaysDiscoverable).start();
     }
 
     @Test
-    public void onStop_shouldStopAlwaysDiscoverable() {
+    public void onStart_setAlwaysDiscoverableAsFalse_shouldStartAlwaysDiscoverable() {
+        mController.setAlwaysDiscoverable(false);
+        mController.onStart();
+
+        verify(mAlwaysDiscoverable, never()).start();
+    }
+
+    @Test
+    public void onStop_setAlwaysDiscoverableAsTrue_shouldStopAlwaysDiscoverable() {
+        mController.setAlwaysDiscoverable(true);
         mController.onStop();
 
         verify(mAlwaysDiscoverable).stop();
     }
+
+    @Test
+    public void onStop__setAlwaysDiscoverableAsFalse_shouldStopAlwaysDiscoverable() {
+        mController.setAlwaysDiscoverable(false);
+        mController.onStop();
+
+        verify(mAlwaysDiscoverable, never()).stop();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java
new file mode 100644
index 0000000..2aa2fa8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022 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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class BluetoothDashboardFragmentTest {
+    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";
+    private static final String TEST_APP_NAME = "com.testapp.settings";
+    private static final String TEST_ACTION = "com.testapp.settings.ACTION_START";
+
+    private BluetoothDashboardFragment mFragment;
+
+    @Before
+    public void setUp() {
+        mFragment = new BluetoothDashboardFragment();
+    }
+
+
+    @Test
+    public void isAlwaysDiscoverable_callingAppIsNotFromSystemApp_returnsFalse() {
+        assertThat(mFragment.isAlwaysDiscoverable(TEST_APP_NAME, TEST_ACTION)).isFalse();
+    }
+
+    @Test
+    public void isAlwaysDiscoverable_callingAppIsFromSettings_returnsTrue() {
+        assertThat(mFragment.isAlwaysDiscoverable(SETTINGS_PACKAGE_NAME, TEST_ACTION)).isTrue();
+    }
+
+    @Test
+    public void isAlwaysDiscoverable_callingAppIsFromSystemUI_returnsTrue() {
+        assertThat(mFragment.isAlwaysDiscoverable(SYSTEMUI_PACKAGE_NAME, TEST_ACTION)).isTrue();
+    }
+
+    @Test
+    public void isAlwaysDiscoverable_actionIsFromSlice_returnsFalse() {
+        assertThat(mFragment.isAlwaysDiscoverable(SYSTEMUI_PACKAGE_NAME, SLICE_ACTION)).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index d446930..867d8f4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -33,7 +33,6 @@
 import android.os.PowerManager;
 
 import com.android.settings.Utils;
-import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +41,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 public class BatteryBroadcastReceiverTest {
@@ -77,9 +75,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void testOnReceive_batteryLevelChanged_dataUpdated() {
         mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
 
@@ -91,9 +86,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void testOnReceive_batteryHealthChanged_dataUpdated() {
         mChargingIntent
                 .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT);
@@ -105,9 +97,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void onReceive_batteryNotPresent_shouldShowHelpMessage() {
         mChargingIntent.putExtra(BatteryManager.EXTRA_PRESENT, false);
 
@@ -117,9 +106,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void testOnReceive_powerSaveModeChanged_listenerInvoked() {
         mBatteryBroadcastReceiver.onReceive(mContext,
                 new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
@@ -128,9 +114,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void testOnReceive_batteryDataNotChanged_listenerNotInvoked() {
         final String batteryLevel = Utils.getBatteryPercentage(mChargingIntent);
         final String batteryStatus =
@@ -148,9 +131,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void testRegister_updateBatteryStatus() {
         doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any());
 
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index 86d6e12..7387407 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -39,7 +39,6 @@
 
 import com.android.settings.R;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
-import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
 import com.android.settings.testutils.shadow.ShadowActivityEmbeddingUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
@@ -151,9 +150,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class
-    })
     public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
         ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
 
@@ -170,9 +166,6 @@
     }
 
     @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryTipLoader.class,
-    })
     public void onStop_isNotDebuggable_shouldRemoveHideSystemOverlay() {
         ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
 
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
index 69333d7..f18d94f 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
@@ -135,7 +135,7 @@
 
         final List<String> actualCards = mManager.mSavedCards.stream().collect(Collectors.toList());
         final List<String> expectedCards = Arrays.asList("test_low_storage", "test_flashlight",
-                "test_dark_theme", "test_gesture", "test_battery");
+                "test_dark_theme", "test_gesture", "test_face_enroll");
         assertThat(actualCards).containsExactlyElementsIn(expectedCards);
     }
 
@@ -695,9 +695,9 @@
                 .setViewType(VIEW_TYPE_FULL_WIDTH)
                 .build());
         cards.add(new ContextualCard.Builder()
-                .setName("test_battery")
+                .setName("test_face_enroll")
                 .setCardType(ContextualCard.CardType.SLICE)
-                .setSliceUri(CustomSliceRegistry.BATTERY_FIX_SLICE_URI)
+                .setSliceUri(CustomSliceRegistry.FACE_ENROLL_SLICE_URI)
                 .setViewType(VIEW_TYPE_FULL_WIDTH)
                 .build());
         return cards;
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java
deleted file mode 100644
index 78541db..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2018 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.homepage.contextualcards.slices;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.Uri;
-import android.os.BatteryUsageStats;
-
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.widget.SliceLiveData;
-
-import com.android.settings.R;
-import com.android.settings.fuelgauge.batterytip.AppInfo;
-import com.android.settings.fuelgauge.batterytip.BatteryTipLoader;
-import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip;
-import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
-import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
-import com.android.settings.fuelgauge.batteryusage.BatteryUsageStatsLoader;
-import com.android.settings.slices.SliceBackgroundWorker;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
-        BatteryFixSliceTest.ShadowBatteryUsageStatsLoader.class,
-        BatteryFixSliceTest.ShadowBatteryTipLoader.class
-})
-public class BatteryFixSliceTest {
-
-    private Context mContext;
-    private BatteryFixSlice mSlice;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mSlice = new BatteryFixSlice(mContext);
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowBatteryTipLoader.reset();
-        ShadowSliceBackgroundWorker.reset();
-        ShadowEarlyWarningTip.reset();
-    }
-
-    @Test
-    public void refreshBatteryTips_hasImportantTip_shouldReturnTrue() {
-        final List<BatteryTip> tips = new ArrayList<>();
-        tips.add(new LowBatteryTip(BatteryTip.StateType.INVISIBLE, false));
-        tips.add(new EarlyWarningTip(BatteryTip.StateType.NEW, false));
-        ShadowBatteryTipLoader.setBatteryTips(tips);
-
-        BatteryFixSlice.refreshBatteryTips(mContext);
-
-        assertThat(BatteryFixSlice.isBatteryTipAvailableFromCache(mContext)).isTrue();
-    }
-
-    @Test
-    public void getSlice_unimportantSlice_shouldSkip() {
-        final List<BatteryTip> tips = new ArrayList<>();
-        final List<AppInfo> appList = new ArrayList<>();
-        appList.add(new AppInfo.Builder()
-                .setPackageName("com.android.settings")
-                .setScreenOnTimeMs(10000L)
-                .build());
-        tips.add(new LowBatteryTip(BatteryTip.StateType.INVISIBLE, false));
-        tips.add(new EarlyWarningTip(BatteryTip.StateType.HANDLED, false));
-        tips.add(new HighUsageTip(1000L, appList));
-        ShadowBatteryTipLoader.setBatteryTips(tips);
-
-        BatteryFixSlice.refreshBatteryTips(mContext);
-        final Slice slice = mSlice.getSlice();
-
-        assertThat(SliceMetadata.from(mContext, slice).isErrorSlice()).isTrue();
-    }
-
-    @Test
-    @Config(shadows = {
-            BatteryFixSliceTest.ShadowEarlyWarningTip.class,
-            BatteryFixSliceTest.ShadowSliceBackgroundWorker.class
-    })
-    public void getSlice_hasImportantTip_shouldTintIcon() {
-        final List<BatteryTip> tips = new ArrayList<>();
-        tips.add(new EarlyWarningTip(BatteryTip.StateType.NEW, false));
-        // Create fake cache data
-        ShadowBatteryTipLoader.setBatteryTips(tips);
-        BatteryFixSlice.refreshBatteryTips(mContext);
-        // Create fake background worker data
-        BatteryFixSlice.BatteryTipWorker batteryTipWorker = mock(
-                BatteryFixSlice.BatteryTipWorker.class);
-        when(batteryTipWorker.getResults()).thenReturn(tips);
-        ShadowSliceBackgroundWorker.setBatteryTipWorkerWorker(batteryTipWorker);
-
-        final Slice slice = mSlice.getSlice();
-
-        assertThat(ShadowEarlyWarningTip.isIconTintColorIdCalled()).isTrue();
-    }
-
-    @Implements(BatteryUsageStatsLoader.class)
-    public static class ShadowBatteryUsageStatsLoader {
-
-        @Implementation
-        protected BatteryUsageStats loadInBackground() {
-            return null;
-        }
-    }
-
-    @Implements(BatteryTipLoader.class)
-    public static class ShadowBatteryTipLoader {
-
-        private static List<BatteryTip> sBatteryTips = new ArrayList<>();
-
-        @Resetter
-        public static void reset() {
-            sBatteryTips = new ArrayList<>();
-        }
-
-        @Implementation
-        protected List<BatteryTip> loadInBackground() {
-            return sBatteryTips;
-        }
-
-        private static void setBatteryTips(List<BatteryTip> tips) {
-            sBatteryTips = tips;
-        }
-    }
-
-    @Implements(SliceBackgroundWorker.class)
-    public static class ShadowSliceBackgroundWorker {
-
-        private static BatteryFixSlice.BatteryTipWorker sBatteryTipWorkerWorker;
-
-        @Resetter
-        public static void reset() {
-            sBatteryTipWorkerWorker = null;
-        }
-
-        @Implementation
-        protected static <T extends SliceBackgroundWorker> T getInstance(Uri uri) {
-            return (T) sBatteryTipWorkerWorker;
-        }
-
-        public static void setBatteryTipWorkerWorker(BatteryFixSlice.BatteryTipWorker worker) {
-            sBatteryTipWorkerWorker = worker;
-        }
-    }
-
-    @Implements(EarlyWarningTip.class)
-    public static class ShadowEarlyWarningTip {
-
-        private static boolean mIsGetIconTintColorIdCalled;
-
-        @Resetter
-        public static void reset() {
-            mIsGetIconTintColorIdCalled = false;
-        }
-
-        @Implementation
-        protected int getIconTintColorId() {
-            mIsGetIconTintColorIdCalled = true;
-            return R.color.battery_bad_color_light;
-        }
-
-        public static boolean isIconTintColorIdCalled() {
-            return mIsGetIconTintColorIdCalled;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index 0962d29..8f43268 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -1,20 +1,12 @@
 package com.android.settings.survey;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.IntentFilter;
 
 import androidx.fragment.app.FragmentActivity;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.overlay.SurveyFeatureProvider;
@@ -28,22 +20,15 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
 
 @RunWith(RobolectricTestRunner.class)
 public class SurveyMixinTest {
 
     private static final String FAKE_KEY = "fake_key";
-    private static final String FAKE_SURVEY_ID = "fake_id";
 
     private Context mContext;
     private SurveyFeatureProvider mProvider;
     @Mock
-    private BroadcastReceiver mReceiver;
-    @Mock
     private InstrumentedPreferenceFragment mFragment;
 
     @Before
@@ -52,99 +37,16 @@
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mProvider = FakeFeatureFactory.setupForTest().getSurveyFeatureProvider(mContext);
-        when(mProvider.getSurveyId(any(), eq(FAKE_KEY))).thenReturn(FAKE_SURVEY_ID);
     }
 
     @Test
-    public void onResume_triesRegisteringReceiverAndDownloadingWhenNoSurveyDetected() {
-        // Pretend there is no survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
-
+    public void onResume_noActionIfActivityDoesNotExist() {
         // Pretend we are an activity that is starting up
         FragmentActivity temp = Robolectric.setupActivity(FragmentActivity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-
-        // Verify that a download was attempted
-        verify(mProvider, times(1)).downloadSurvey(any(), any(), any());
-        // Verify that we registered a receiver for download completion broadcasts
-        verify(mProvider, times(1)).createAndRegisterReceiver(any());
-        // Verify we did not try to show a survey
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-    }
-
-    @Test
-    public void onResume_triesShowingSurveyWhenOneIsPresent() {
-        // Pretend there is a survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(0L);
-
-        // Pretend we are an activity that is starting up
-        FragmentActivity temp = Robolectric.setupActivity(FragmentActivity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-
-        // Verify that a download was not attempted
-        verify(mProvider, never()).downloadSurvey(any(), any(), any());
-        // Verify that we did not register a receiver
-        verify(mProvider, never()).createAndRegisterReceiver(any());
-        // Verify we tried to show a survey
-        verify(mProvider, times(1)).showSurveyIfAvailable(any(), any());
-    }
-
-    @Test
-    public void onResume_doesNothingWhenActivityIsNull() {
-        // Pretend the activity died somewhere in the process
         when(mFragment.getActivity()).thenReturn(null);
         SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
         mixin.onResume();
 
-        // Verify we don't try showing or downloading a survey
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-        verify(mProvider, never()).downloadSurvey(any(), any(), any());
-    }
-
-    @Test
-    public void onPause_removesReceiverIfPreviouslySet() {
-        // Pretend there is a survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
-
-        // Pretend we are an activity that starts and stops
-        FragmentActivity temp = Robolectric.setupActivity(FragmentActivity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        when(mProvider.createAndRegisterReceiver(any())).thenReturn(mReceiver);
-        LocalBroadcastManager manager = LocalBroadcastManager.getInstance(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onResume();
-        manager.registerReceiver(mReceiver, new IntentFilter());
-        mixin.onPause();
-
-        // Verify we remove the receiver
-        HashMap<BroadcastReceiver, ArrayList<IntentFilter>> map =
-                ReflectionHelpers.getField(manager, "mReceivers");
-        assertThat(map.containsKey(mReceiver)).isFalse();
-    }
-
-    @Test
-    public void onPause_doesNothingWhenActivityOrReceiverNull() {
-        // Pretend there is a survey in memory
-        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
-
-        // Pretend we are an activity that fails to create a receiver properly
-        FragmentActivity temp = Robolectric.setupActivity(FragmentActivity.class);
-        when(mFragment.getActivity()).thenReturn(temp);
-        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);
-        mixin.onPause();
-
-        // Verify we do nothing;
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
-
-        // pretend the activity died before onPause
-        when(mFragment.getActivity()).thenReturn(null);
-        mixin.onPause();
-
-        // Verify we do nothing
-        verify(mProvider, never()).showSurveyIfAvailable(any(), any());
+        verify(mProvider, times(0)).sendActivityIfAvailable(FAKE_KEY);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/users/TimeoutToUserZeroPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/users/TimeoutToUserZeroPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
index e284d90..2c93e94 100644
--- a/tests/robotests/src/com/android/settings/users/TimeoutToUserZeroPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.users;
 
-import static android.provider.Settings.Secure.TIMEOUT_TO_USER_ZERO;
+import static android.provider.Settings.Secure.TIMEOUT_TO_DOCK_USER;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -45,12 +45,12 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowSecureSettings.class, ShadowUserHandle.class})
-public class TimeoutToUserZeroPreferenceControllerTest {
+public class TimeoutToDockUserPreferenceControllerTest {
     private Context mContext;
     private Resources mResources;
-    private TimeoutToUserZeroPreferenceController mController;
+    private TimeoutToDockUserPreferenceController mController;
 
-    private static final String FAKE_PREFERENCE_KEY = "timeout_to_user_zero_preference";
+    private static final String FAKE_PREFERENCE_KEY = "timeout_to_dock_user_preference";
 
     private String[] mEntries;
     private String[] mValues;
@@ -62,15 +62,15 @@
         doReturn(mResources).when(mContext).getResources();
 
         mEntries = mResources.getStringArray(
-                R.array.switch_to_user_zero_when_docked_timeout_entries);
+                R.array.switch_to_dock_user_when_docked_timeout_entries);
         mValues = mResources.getStringArray(
-                R.array.switch_to_user_zero_when_docked_timeout_values);
+                R.array.switch_to_dock_user_when_docked_timeout_values);
 
-        mController = new TimeoutToUserZeroPreferenceController(mContext, FAKE_PREFERENCE_KEY);
+        mController = new TimeoutToDockUserPreferenceController(mContext, FAKE_PREFERENCE_KEY);
 
         // Feature enabled.
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_enableTimeoutToUserZeroWhenDocked)).thenReturn(
+                com.android.internal.R.bool.config_enableTimeoutToDockUserWhenDocked)).thenReturn(
                 true);
 
         // Multi-user feature enabled.
@@ -89,7 +89,7 @@
     @Test
     public void getAvailabilityStatus_featureFlagDisabled_returnUnsupportedOnDevice() {
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_enableTimeoutToUserZeroWhenDocked)).thenReturn(
+                com.android.internal.R.bool.config_enableTimeoutToDockUserWhenDocked)).thenReturn(
                 false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
@@ -121,7 +121,7 @@
 
     @Test
     public void getSummary_settingNotSet() {
-        Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_USER_ZERO,
+        Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
                 null, UserHandle.myUserId());
 
         assertThat(mController.getSummary().toString()).isEqualTo(mEntries[0]);
@@ -129,7 +129,7 @@
 
     @Test
     public void getSummary_setToNever() {
-        Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_USER_ZERO,
+        Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
                 mValues[0], UserHandle.myUserId());
 
         assertThat(mController.getSummary().toString()).isEqualTo(mEntries[0]);
@@ -137,7 +137,7 @@
 
     @Test
     public void getSummary_setToOneMinute() {
-        Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_USER_ZERO,
+        Settings.Secure.putStringForUser(mContext.getContentResolver(), TIMEOUT_TO_DOCK_USER,
                 mValues[1], UserHandle.myUserId());
 
         assertThat(mController.getSummary().toString()).isEqualTo(mEntries[1]);
diff --git a/tests/robotests/src/com/android/settings/users/TimeoutToUserZeroSettingsTest.java b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/users/TimeoutToUserZeroSettingsTest.java
rename to tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
index 0bd5b60..55b630d 100644
--- a/tests/robotests/src/com/android/settings/users/TimeoutToUserZeroSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserSettingsTest.java
@@ -42,11 +42,11 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowFragment.class})
-public class TimeoutToUserZeroSettingsTest {
+public class TimeoutToDockUserSettingsTest {
     @Mock
     private FragmentActivity mActivity;
 
-    private TimeoutToUserZeroSettings mSettings;
+    private TimeoutToDockUserSettings mSettings;
 
     private String[] mEntries;
     private String[] mValues;
@@ -57,10 +57,10 @@
 
         final Context context = spy(ApplicationProvider.getApplicationContext());
         mEntries = context.getResources().getStringArray(
-                R.array.switch_to_user_zero_when_docked_timeout_entries);
+                R.array.switch_to_dock_user_when_docked_timeout_entries);
         mValues = context.getResources().getStringArray(
-                R.array.switch_to_user_zero_when_docked_timeout_values);
-        mSettings = spy(new TimeoutToUserZeroSettings());
+                R.array.switch_to_dock_user_when_docked_timeout_values);
+        mSettings = spy(new TimeoutToDockUserSettings());
 
         doReturn(context).when(mSettings).getContext();
         doReturn(mActivity).when(mSettings).getActivity();
diff --git a/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
index 3319e2a..484138e 100644
--- a/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
@@ -60,7 +60,7 @@
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
+                com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(false);
         when(mUserManager.isSystemUser()).thenReturn(true);
         assertTrue(mController.isAvailable());
@@ -71,7 +71,7 @@
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
+                com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(false);
         when(mUserManager.isSystemUser()).thenReturn(false);
         assertTrue(mController.isAvailable());
@@ -82,7 +82,7 @@
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(false);
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
+                com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(false);
         when(mUserManager.isSystemUser()).thenReturn(true);
         assertFalse(mController.isAvailable());
@@ -93,7 +93,7 @@
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
+                com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(true);
         when(mUserManager.isSystemUser()).thenReturn(true);
         assertTrue(mController.isAvailable());
@@ -104,7 +104,7 @@
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
-                com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser))
+                com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(true);
         when(mUserManager.isSystemUser()).thenReturn(false);
         assertFalse(mController.isAvailable());