diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b9c0f9f..c596152 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,7 @@
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+    <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
 
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
diff --git a/res/layout/preference_widget_seekbar_settings.xml b/res/layout/preference_widget_seekbar_settings.xml
index 87fea99..c25c598 100644
--- a/res/layout/preference_widget_seekbar_settings.xml
+++ b/res/layout/preference_widget_seekbar_settings.xml
@@ -19,36 +19,36 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:layout_marginTop="6dp"
+    android:layout_marginBottom="6dp"
     android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="6dp"
-    android:paddingTop="6dp">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="60dp"
-        android:layout_marginEnd="8dp"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:paddingStart="56dp"
+        android:paddingEnd="8dp"
         android:singleLine="true"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="?android:attr/textColorPrimary"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal" />
+        android:textColor="?android:attr/textColorPrimary" />
 
     <TextView
         android:id="@android:id/summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="60dp"
-        android:layout_marginEnd="8dp"
-        android:layout_below="@android:id/title"
         android:layout_alignStart="@android:id/title"
+        android:layout_below="@android:id/title"
+        android:maxLines="4"
+        android:paddingStart="56dp"
+        android:paddingEnd="8dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary"
-        android:maxLines="4" />
+        android:textColor="?android:attr/textColorSecondary" />
 
     <com.android.settings.widget.DefaultIndicatorSeekBar
         android:id="@*android:id/seekbar"
@@ -57,7 +57,7 @@
         android:layout_height="48dp"
         android:layout_alignParentEnd="true"
         android:layout_below="@android:id/summary"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="44dp" />
+        android:paddingStart="56dp"
+        android:paddingEnd="8dp" />
 
 </RelativeLayout>
diff --git a/res/layout/wifi_network_details_two_buttons_panel.xml b/res/layout/wifi_network_details_two_buttons_panel.xml
new file mode 100644
index 0000000..6abfac3
--- /dev/null
+++ b/res/layout/wifi_network_details_two_buttons_panel.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<!--
+  Defines a panel with two buttons and a spacer in between.
+  The right button uses the Material.Button.Colored style.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:paddingTop="4dip"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/forget_button"
+            android:layout_width="120dip"
+            android:layout_weight="0.4"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
+        <!-- Spacer -->
+        <View
+            android:id="@+id/buttons_spacer_left"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:layout_weight="0.2" />
+        <Button
+            style="@android:style/Widget.Material.Button.Colored"
+            android:id="@+id/signin_button"
+            android:layout_width="120dip"
+            android:text="@string/cancel"
+            android:layout_weight="0.4"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 567d7ec..ee8850b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Instellings kan nie op jou handeling reageer nie, omdat \'n ander program bo-oor hierdie opsies gewys word."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"As jy <xliff:g id="SERVICE">%1$s</xliff:g> aanskakel, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Omdat jy \'n toeganklikheiddiens aangeskakel het, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Jy moet jou patroon bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Programgebruik sedert battery volgelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Toestelgebruik sedert battery vol gelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hoe lank skerm aan was sedert battery volgelaai is"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Toestelgebruik sedert battery volgelaai is"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> lank gebruik"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Skermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruik deur <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van algehele batterygebruik"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ontleding sedert battery laas volgelaai is"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Kennisgewings"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Gevorderd"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Werkkennisgewings"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Laat ikoonkentekens toe"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Flikkerende lig"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op die sluitskerm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorieë is uitgevee</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategorie is uitgevee</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Kennisgewingkentekens"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aan"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Af"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Moet nooit hierdie kennisgewings wys nie"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Wys kennisgewings"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Moet nooit kennisgewings in die skadu of op randtoestelle wys nie"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Laat ikoonkenteken toe"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie Steur Nie"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie Steur Nie na \'Net prioriteit\' gestel is"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op die sluitskerm"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batteryoptimalisering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Opletberigte oor gebruik"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Wys alle programme"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Versteek ekstra programme"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Wys volle toestelgebruik"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Wys programgebruik"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimaliseer nie"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b5b1ce8..561ec4f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ይህን ማድረግ አለበት፦"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"አንድ መተግበሪያ የፍቃድ ጥያቄ እያገደ ስለሆነ ቅንብሮች ጥያቄዎን ማረጋገጥ አይችሉም።"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ሌላ መተግበሪያ በእነዚህ አማራጮች ላይ እያሳየ ስለሆነ ቅንብሮች ለእርስዎ እርምጃ ምላሽ መስጠት አይችልም።"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ካበሩት፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"አንድ የተደራሽነት አገልግሎትን ስላበሩ፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን ስርዓተ-ጥለት ማረጋገጥ ያስፈልግዎታል።"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅኝት"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"ከ<xliff:g id="TIME">^1</xliff:g> በፊት"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"ከሙሉ ኃይል ጊዜ ጀምሮ ያለው የመተግበሪያ አጠቃቀም (ከ<xliff:g id="TIME">^1</xliff:g> በፊት)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ከሙሉ ኃይል ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም (ከ<xliff:g id="TIME">^1</xliff:g> በፊት)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ማያ ገጹ በርቶ የቆየበት ጊዜ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ለ<xliff:g id="TIME">^1</xliff:g> ጥቅም ላይ ውሏል"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"የማያ ገጽ አጠቃቀም <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ተጠቅሟል"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ከጠቅላላ ባትሪ"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"መጨረሻ ላይ ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው ትንታኔ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ማሳወቂያዎች"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"የላቀ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"የስራ ማሳወቂያዎች"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"የአዶ ባጆችን ያሳዩ"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ብርሃን አብለጭለጭ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"በማያ ገጽ ቁልፉ ላይ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ሁሉንም የማሳወቂያ ይዘቶችን አሳይ"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ምድቦች ተሰርዘዋል</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ምድቦች ተሰርዘዋል</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"የማሳወቂያ ባጆች"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"በርቷል"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ጠፍቷል"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"እነዚህን ማሳወቂያዎች በጭራሽ አታሳይ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ማሳወቂያዎች አሳይ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"በጥላ ወይም በጎን ያሉ ውጫዊ መሣሪያዎች ላይ ማሳወቂያዎችን በጭራሽ አታሳይ"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"የአዶ ባጅ ይፍቀዱ"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"«አትረብሽ»ን ሻር"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"«አትረብሽ» ወደ ቅድሚያ ብቻ በሚቀናበርበት ጊዜ እነዚህ ማሳወቂያዎች እንዲያቋርጡ ይፍቀዱ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"በማያ ገጽ ቁልፉ ላይ"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ባትሪን ማትባት"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"የአጠቃቀም ማንቂያዎች"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"ሁሉንም መተግበሪያዎች አሳይ"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"ተጨማሪ መተግበሪያዎችን ደብቅ"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ሙሉ የመሣሪያ አጠቃቀም አሳይ"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"የመተግበሪያ አጠቃቀም አሳይ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"አልተባም"</string>
     <string name="high_power_on" msgid="6216293998227583810">"አልተባም"</string>
     <string name="high_power_off" msgid="3393904131961263278">"የባትሪ አጠቃቀምን አትባ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3dd7553..32aa721 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1934,7 +1934,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"بسبب عرض تطبيق آخر في أعلى هذه الخيارات، لا يمكن أن تستجيب الإعدادات للإجراء الذي اتخذته."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"في حالة تمكين <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات، وذلك لأنك قد مكّنت إحدى خدمات إمكانية الوصول."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد النقش."</string>
@@ -1998,6 +1997,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"قبل <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"استخدام التطبيق منذ الشحن الكامل (قبل <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"استخدام الجهاز منذ الشحن الكامل (قبل <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"مقدار وقت تشغيل الشاشة منذ الشحن الكامل"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"استخدام الجهاز منذ الشحن الكامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استخدام البطارية عند فصل الطاقة"</string>
@@ -2089,8 +2089,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"تم استخدامه لمدة <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"استخدام الشاشة <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> مستخدمة بواسطة <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> من إجمالي شحن البطارية"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفاصيل الاستخدام منذ آخر شحن كامل"</string>
@@ -2887,7 +2886,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"الإشعارات"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"متقدمة"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"إشعارات العمل"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"السماح بشارات الرمز"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"وميض الضوء"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"على شاشة التأمين"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
@@ -2974,14 +2974,16 @@
       <item quantity="other">تم حذف <xliff:g id="COUNT_1">%d</xliff:g> فئة</item>
       <item quantity="one">تم حذف فئة واحدة (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"علامات الإشعارات"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"تشغيل"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"إيقاف"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"حظر الكل"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"عدم عرض هذه الإشعارات"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"عرض الإشعارات"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"‏عدم عرض الإشعارات في مركز الإشعارات أو على الأجهزة المرتبطة بحساب Google"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"السماح بشارة الرمز"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"إلغاء وضع \"عدم الإزعاج\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"السماح لهذه الإشعارات بمتابعة المقاطعة عند تعيين وضع \"عدم الإزعاج\" على \"ذات الأولوية فقط\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"على شاشة التأمين"</string>
@@ -3238,8 +3240,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"تحسين البطارية"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"تنبيهات الاستخدام"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"إظهار جميع التطبيقات"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"إخفاء التطبيقات الإضافية"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"عرض الاستخدام الكامل للجهاز"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"عرض استخدام التطبيق"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بدون تحسين"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بدون تحسين"</string>
     <string name="high_power_off" msgid="3393904131961263278">"يحسِّن من استخدام البطارية"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 5eec8ff..14b5370 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> xidməti istifadə edilsin?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> etməlidir:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Çünki, tətbiq icazə sorğusunu anlaşılmaz edir. Ayarlar cavabınızı doğrulaya bilməz."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Digər tətbiqlər bu seçimlərin üstündə göstərildiyinə görə Ayarlar əməliyyata cavab verə bilmir."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktiv olarsa, cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Girişimlik xidmətini aktiv etdiyiniz üçün cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün modelinizi təsdiq etməlisiniz."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> əvvəl"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam doldurmadan sonrakı tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Tam doldurmadan sonra tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Dam doldurmadan sonra ekranın vaxtı miqdarı aktiv edilib"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam doldurmadan sonrakı cihaz istifadəsi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Elektrik şəbəkəsindən çıxarılandan sonra batareya istifadəsi"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> üçün istifadə olundu"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ekran istifadəsi <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadə etdi"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadəsi"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sonuncu tam doldurmadan sonrakı istifadə problemi"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirişlər"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Qabaqcıl"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"İş bildirişləri"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"İkona nişanlarına icazə verin"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Parıltı işığı"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Ekran kilidində"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bütün bildiriş məzmunlarını göstər"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kateqoriya silindi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kateqoriya silindi</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Bildiriş nişanı"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aktiv"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Deaktiv"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Hamısını bloklayın"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirişlər heç vaxt göstərilməsin"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirişləri göstərin"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirişləri heç vaxt ekranda və ya periferik cihazlarda göstərməyin."</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"İkona nişanına icazə verin"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Narahat etməyin\" seçimini əvəzləyin"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Narahat Etməyin seçimi Yalnız Prioritet üçün ayarlandıqda bildirişlərin mane olmasına imkan verin"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekran kilidində"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batareya optimallaşdırılması"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"İstifadə siqnalları"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Bütün tətbiqləri göstərin"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Əlavə tətbiqləri gizlədin"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz istifadəsini göstərin"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Tətbiq istifadəsini göstərin"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Enerjiyə qənaət etmir"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Enerjiyə qənaət etmir"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya istifadəsi optimallaşdırılır"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 29f79b3..1d047df 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1874,7 +1874,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Želite li da koristite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Pošto aplikacija skriva zahtev za dozvolu, Podešavanja ne mogu da verifikuju odgovor."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Podešavanja ne mogu da odgovore na radnju jer se neka druga aplikacija prikazuje preko ovih opcija."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pošto ste uključili uslugu pristupačnosti, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite šablon."</string>
@@ -1935,6 +1934,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Korišćenje aplikacije od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Korišćenje uređaja od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena tokom kojeg je ekran bio uključen od potpunog punjenja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Korišćenje uređaja od potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Korišćenje baterije nakon isključivanja"</string>
@@ -2026,8 +2026,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Korišćenje ekrana: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> koristi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog kapaciteta baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od poslednjeg potpunog punjenja"</string>
@@ -2806,7 +2805,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obaveštenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredna"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obaveštenja za Work"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Dozvoli značke na ikonama"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Uključi treperenje lampice"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obaveštenja"</string>
@@ -2884,14 +2884,16 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije su izbrisane</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisano</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Značke obaveštenja"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Uključeno"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Isključeno"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obaveštenja"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikazuj obaveštenja"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Obaveštenja se nikada ne prikazuju na traci ili periferijskim uređajima"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Dozvoli značku na ikoni"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zameni režim Ne uznemiravaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Omogućava da ova obaveštenja nastave da se prikazuju kada je režim Ne uznemiravaj podešen na opciju Samo prioritetni prekidi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -3130,8 +3132,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Obaveštenja o korišćenju"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korišćenje uređaja"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korišćenje aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optimizacije"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija korišćenja baterije"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 47289ee..0b9f0ec 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1895,7 +1895,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> патрабуе:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Паверх запыту дазволу адлюстроўваецца дадатак, таму ваш адказ не можа быць правераны ў Наладах."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Іншая праграма адлюстроўваецца паверх гэтых опцый, таму налады не адказваюць на ваша дзеянне."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Калі вы ўключыце <xliff:g id="SERVICE">%1$s</xliff:g>, прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Вы ўключылі службу доступу, таму ваша прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой графічны ключ."</string>
@@ -1957,6 +1956,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Спажыванне прыладай з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Колькасць часу, калі экран быў уключаны, з моманту поўнай зарадкі"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Выкарыстанне прылады з моманту поўнай зарадкі"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Выкарыстанне акумулятару з моманту адключэння"</string>
@@ -2048,8 +2048,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Выкарыстанне экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> выкарыстана праграмай <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ад усяго зараду"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбіўка з моманту апошняй поўнай зарадкі"</string>
@@ -2834,7 +2833,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Апавяшчэнні"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Пашыраныя"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Апавяшчэнні працоўнага профілю"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Дазволіць паказваць паметкі на значку"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Мігценне святла"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На экране блакіроўкі"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Паказваць усё змесціва ў апавяшчэннях"</string>
@@ -2915,14 +2915,16 @@
       <item quantity="many">Выдалены <xliff:g id="COUNT_1">%d</xliff:g> катэгорый</item>
       <item quantity="other">Выдалены <xliff:g id="COUNT_1">%d</xliff:g> катэгорыі</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Мадыфікатары значка ў якасці апавяшч-няў"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Уключаны"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Адключаны"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блакіраваць усё"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколі не паказваць гэтыя апавяшчэнні"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Паказваць апавяшчэнні"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколі не паказваць апавяшчэнні на \"шторцы\" або на перыферыйных прыладах"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Дазволіць паказваць паметкі на значку"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ігнараваць рэжым «Не турбаваць»"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Паказваць гэтыя апавяшчэнні, калі ў рэжыме «Не турбаваць» выбрана «Толькі прыярытэтныя»"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На экране блакіроўкі"</string>
@@ -3168,8 +3170,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Аптымізацыя акумулятара"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Абвесткі аб выкарыстанні"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Паказваць усе праграмы"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Не паказваць дадатк. праграмы"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Паказаць поўнае выкарыстанне прылады"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Паказаць спажыванне праграмамі"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не аптымізаваныя"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не аптымізавана"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Аптымізацыя выкарыстання акумулятара"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7d765c2..3ce80a1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> изисква:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"От Настройки не може да се получи потвърждение за отговора ви, защото заявката за разрешение се прикрива от приложение."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Тъй като друго приложение се показва върху тези опции, Настройки не може да отговори на действието ви."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако включите <xliff:g id="SERVICE">%1$s</xliff:g>, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Тъй като сте включили услуга за достъпност, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите фигурата си."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Преди <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Използване от приложенията след пълно зареждане (преди <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Използване на устройството след пълно зареждане (преди <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Колко време е бил включен екранът след последното пълно зареждане"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Използване на устройството след пълно зареждане"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батерията след изключването"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Използвано за <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Използване на екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"Използван капацитет от <xliff:g id="APP">%2$s</xliff:g>: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> от общия капацитет на батерията"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбивка след последното пълно зареждане"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Известия"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Разширени"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Служебни известия"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Разрешав. на значки за иконата"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Премигваща светлина"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Върху заключения екран"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Цялото съдържание от известията"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категории са изтрити</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категория е изтрита</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Значки за известия"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Включено"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Изключено"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Без показване на тези известия"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Показване на известията"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Без показване на известия в падащия панел или на периферни устройства"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Разрешаване на значка за иконата"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отмяна на „Не безпокойте“"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешаване на тези известия да продължат да ви прекъсват, когато за режим „Не безпокойте“ е зададено „Само с приоритет“."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Върху заключения екран"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Оптимизиране на батерията"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Сигнали за употребата"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Показване на всички приложения"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Допълн. приложения: Скриване"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Цялостно използване на у-вото: Показване"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Употреба на прилож.: Показване"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизиране"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Без оптимизиране"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Разходът на батерията се оптимизира"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d367206..6311d3f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যবহার করবেন?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> কে এটি করতে হবে:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"একটি অ্যাপ্লিকেশান কোনো অনুমোদনের অনুরোধকে অস্পষ্ট করছে, তাই সেটিংস আপনার প্রতিক্রিয়া যাচাই করতে পারেনি৷"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"অন্য একটি অ্যাপ এই বিকল্পগুলির উপরে ডিসপ্লে হচ্ছে বলে সেটিংস আপনার দেওয়া ইনপুট বুঝতে পারছে না।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"আপনি যদি <xliff:g id="SERVICE">%1$s</xliff:g> চালু করেন, তাহলে ডেটা এনক্রিপশান উন্নত করতে আপনার ডিভাইস আপনার স্ক্রীন লক ব্যবহার করবে না৷"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"যেহেতু আপনি অ্যাক্সেসযোগ্যতা পরিষেবা চালু করেছেন, তাই ডেটা এনক্রিপশান উন্নত করতে আপনার ডিভাইস আপনার স্ক্রীন লক ব্যবহার করবে না৷"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার প্যাটার্ন নিশ্চিত করতে হবে।"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> আগে"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"সম্পূর্ণ চার্জ হওয়া থেকে অ্যাপের ব্যবহার (<xliff:g id="TIME">^1</xliff:g> আগে)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"সম্পূর্ণ চার্জ হওয়া থেকে ডিভাইসের ব্যবহার (<xliff:g id="TIME">^1</xliff:g> আগে)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"সম্পূর্ণ চার্জ হওয়ার সময় থেকে স্ক্রিন কত সময় চালু রয়েছে"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"সম্পূর্ণ চার্জ করার সময় থেকে ডিভাইসের ব্যবহার"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"আনপ্লাগ করার পর থেকে ব্যাটারি ব্যবহার"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> এর জন্য ব্যবহার করা হয়েছে"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"স্ক্রিনের ব্যবহার <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> এর দ্বারা <xliff:g id="PERCENT">%1$s</xliff:g> ব্যবহার করা হয়েছে"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"সামগ্রিক ব্যাটারির <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"শেষবার সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারির ব্যবহার"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"বিজ্ঞপ্তি"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"উন্নত"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"আইকন ব্যাজের অনুমতি দিন"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"মিটমিট করা আলো"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রীনে"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি বিভাগ মোছা হয়েছে</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি বিভাগ মোছা হয়েছে</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"বিজ্ঞপ্তি ব্যাজ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"চালু আছে"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"বন্ধ আছে"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"সমস্ত অবরুদ্ধ করুন"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"এই বিজ্ঞপ্তিগুলি কখনোই দেখানো হবে না"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"বিজ্ঞপ্তিগুলি দেখান"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ছায়া বা পেরিফেরাল ডিভাইসে কখনও বিজ্ঞপ্তিগুলি দেখায় না"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"আইকন ব্যাজের অনুমতি দিন"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"যখন শুধুমাত্র অগ্রাধিকার সাপেক্ষে \'বিরক্ত করবেন না\' সেট করা থাকবে তখন বাধাদানের ক্ষেত্রে এই বিজ্ঞপ্তিগুলিকে চালু থাকতে দিন"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রীনে"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ব্যাটারি অপ্টিমাইজেশান"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ব্যবহারের সতর্কতা"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"সব অ্যাপ দেখুন"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"অতিরিক্ত অ্যাপগুলি লুকান"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"সম্পূর্ণ ডিভাইসের ব্যবহার দেখান"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"অ্যাপের ব্যবহার দেখান"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"অপ্টিমাইজ করা নেই"</string>
     <string name="high_power_on" msgid="6216293998227583810">"অপ্টিমাইজ করা নেই"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ব্যাটারির ব্যবহার অপ্টিমাইজ করা হচ্ছে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d4798f3..73e94ac 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -171,7 +171,7 @@
     <string name="proxy_clear_text" msgid="5555400754952012657">"Obriši"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Priključak za proksi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobilazni proksi za"</string>
-    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovi zadane vrijednosti"</string>
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Vrati na zadano"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Gotovo"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Proksi hostname"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
@@ -436,8 +436,8 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg tableta više nisu dostupni. \n\n Da biste nastavili koristiti tablet, treba da izvršite vraćanje tableta na fabričke postavke. Nakon što izvršite postavke tableta nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg telefona više nisu dostupni. \n\nDa biste nastavili koristiti telefon, treba da izvršite vraćanje telefona na fabričke postavke. Nakon što izvršite postavke telefona nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Dešifriranje nije uspjelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti ponovno postavljanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da obnovite podatke čija rezervna kopija je spremljena u vaš Google račun."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti ponovno postavljanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da obnovite podatke čija rezervna kopija je spremljena u vaš Google račun."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promijeni način unosa"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Postavite zaključavanje ekrana"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
@@ -1312,7 +1312,7 @@
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB pohranu"</string>
@@ -1879,7 +1879,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Koristiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> treba da:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacija nije dala dozvolu za zahtjev pa postavke ne mogu potvrditi vaš odgovor."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Postavke ne reagiraju na vašu radnju jer druga aplikacija prekriva ove opcije."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukoliko uključite uslugu <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pošto ste uključili uslugu pristupačnosti, vaš uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj obrazac."</string>
@@ -1940,6 +1939,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Korištenje aplikacije od potpune punjenosti (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Korištenje uređaja od potpune napunjenosti (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Vrijeme koliko je ekran uključen od potpune napunjenosti"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Korištenje uređaja od potpune napunjenosti"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Potrošnja baterije od isključivanja s napajanja"</string>
@@ -2032,8 +2032,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Korišteno <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Korištenje ekrana <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"Aplikacija <xliff:g id="APP">%2$s</xliff:g> koristi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od posljednje potpune napunjenosti"</string>
@@ -2175,7 +2174,7 @@
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne situacije"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosno kopiranje"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Rezervna kopija i obnavljanje"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Izrada sigurnosnih kopija podataka"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Pravite sigurnosne kopije podataka aplikacija, lozinki za Wi-Fi te drugih postavki na Google serverima"</string>
@@ -2819,7 +2818,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obavještenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Dozvoli značke ikona"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Trepćuće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikazuj sav sadržaj obavještenja"</string>
@@ -2897,14 +2897,16 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije su izbrisane</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisano</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Značke obavještenja"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Uključeno"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Isključeno"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obavještenja"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavještenja"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavještenja u nijansi ili na perifernim uređajima"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Dozvoli značku ikone"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Premosti podešenja usluge Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Dozvolite da se ova obavještenja i dalje čuju kada je opcija Ne ometaj podešena na Samo prioritetna obavještenja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -3144,8 +3146,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Obavještenja o upotrebi"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korištenje uređaja"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korištenje aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index bd81a0d..4ce526d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -792,7 +792,7 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Aquesta xarxa no té accés a Internet. Vols mantenir-hi la connexió?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"No ho tornis a preguntar en aquesta xarxa"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"La Wi‑Fi no està connectada a Internet"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"Pots canviar a la xarxa de telefonia mòbil sempre que la connexió Wi‑Fi no sigui prou bona. És possible que s\'apliquin càrrecs per ús de dades."</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Pots canviar a la xarxa de telefonia mòbil sempre que la connexió Wi‑Fi no sigui prou bona. És possible que s\'hi apliquin càrrecs per ús de dades."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Canvia a la xarxa de telefonia mòbil"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Mantén la connexió a la Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"No ho mostris mai més"</string>
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Com que hi ha una aplicació que oculta una sol·licitud de permís, no es pot verificar la teva resposta des de la configuració."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"L\'aplicació Configuració no pot realitzar l\'acció perquè hi ha una altra aplicació que s\'està mostrant a sobre d\'aquestes opcions."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si actives <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Com que has activat un servei d\'accessibilitat, el teu dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Cal que confirmis el patró perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes de telefonia mòbil"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Fa <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Ús d\'aplicacions des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ús del dispositiu des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Temps que la pantalla ha estat activa des de l\'última càrrega completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ús del dispositiu des de l\'última càrrega completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"En ús durant <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ús de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilitzat per <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> d\'ús de la bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglossament des de l\'última càrrega completa"</string>
@@ -2221,7 +2220,7 @@
     <string name="sync_failed" msgid="1696499856374109647">"La sincronització ha fallat"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronització activa"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronització"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Tornarà a funcionar aviat."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"El perfil professional encara no està disponible."</string>
     <string name="work_mode_label" msgid="5794470908668593961">"Mode de feina"</string>
@@ -2657,7 +2656,7 @@
     <string name="network_dashboard_title" msgid="4771589228992391573">"Xarxa i Internet"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mòbil, ús de dades i punt d\'accés Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emissió, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacions predeterminades"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuaris i comptes"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permet icones encerclades"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A la pantalla de bloqueig"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories suprimides</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria suprimida</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Insígnies de notificació"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activat"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desactivades"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostris mai aquestes notificacions"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notificacions"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostris mai notificacions a l\'àrea de notificacions ni en dispositius perifèrics"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permet icones encerclades"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Fes prioritària"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions continuïn interrompent quan el mode No molestis estigui configurat com a Només amb prioritat"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A la pantalla de bloqueig"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimització de la bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostra totes les aplicacions"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Amaga aplicacions addicionals"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostra l\'ús complet del dispositiu"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostra l\'ús de l\'aplicació"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sense optimitzar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f4f1d73..ab02210 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Zapnout <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potřebuje:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Žádost o oprávnění je blokována jinou aplikací. Nastavení proto vaši odpověď nemůže ověřit."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Nastavení na vaši akci nemůže zareagovat, protože se přes tyto možnosti zobrazuje jiná aplikace."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Pokud zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, zařízení nebude používat zámek obrazovky k vylepšení šifrování dat."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vzhledem k tomu, že jste zapnuli službu přístupnosti, nebude zařízení používat zámek obrazovky k vylepšení šifrování dat."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili své gesto."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Před <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Využití aplikací od úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Využití zařízení od posledního úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Doba, po kterou byla od úplného nabití zapnutá obrazovka"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Využití zařízení od úplného nabití"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Využíváno <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Využití obrazovky: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> bylo použito aplikací <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> z celkové kapacity baterie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Přehled od posledního úplného nabití"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Oznámení"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšířená nastavení"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovní oznámení"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Povolit odznaky na ikonách"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikání kontrolky"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na obrazovce uzamčení"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="other">Bylo smazáno <xliff:g id="COUNT_1">%d</xliff:g> kategorií</item>
       <item quantity="one">Byla smazána <xliff:g id="COUNT_0">%d</xliff:g> kategorie</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Odznaky oznámení"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Zapnuto"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Vypnuto"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Tato oznámení nikdy nezobrazovat"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovat oznámení"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nezobrazovat oznámení na panelu ani v periferních zařízeních"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Povolit odznak na ikoně"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Přepsat nastavení Nerušit"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožnit těmto oznámením vyrušit mě, pokud je v nastavení Nerušit vybrána možnost Pouze prioritní"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na obrazovce uzamčení"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimalizace výdrže bat."</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornění na využití"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Zobrazit všechny aplikace"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Skrýt aplikace navíc"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Zobrazit úplné využití zařízení"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Zobrazit využití aplikace"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizováno"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimalizováno"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimalizace využívání baterie"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b64255a..b5ff8e1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Indstillinger kan ikke bekræfte dit svar, fordi en app tilslører tilladelsesanmodningen."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Da en anden app vises oven på disse valgmuligheder, kan Indstillinger ikke reagere på din handling."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du aktiverer <xliff:g id="SERVICE">%1$s</xliff:g>, vil enheden ikke benytte skærmlåsen til at forbedre datakrypteringen."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Fordi du har aktiveret en tilgængelighedstjeneste, vil enheden ikke benytte skærmlåsen for at forbedre datakrypteringen."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte dit mønster."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"For <xliff:g id="TIME">^1</xliff:g> siden"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Appforbrug siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Brug af enheden siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lang tid skærmen har været tændt siden fuld opladning"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Brug af enheden siden fuld opladning"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Skærmtid <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> anvendt af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede batteriforbrug"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Siden sidste fulde opladning"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Underretninger"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanceret"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Arbejdsunderretninger"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Tillad ikonbadges"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskærmen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt indhold i underretninger"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategori blev slettet</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier blev slettet</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Underretningsbadges"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Til"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Fra"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Vis aldrig disse underretninger"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Vis underretninger"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Vis aldrig underretninger i underretningspanelet eller på eksterne enheder"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Tillad ikonbadge"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Tilsidesæt Forstyr ikke"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er slået til med angivelsen Kun prioritet"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskærmen"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batterioptimering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Underretninger om forbrug"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Vis alle apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Skjul ekstra apps"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Vis brug af enheden siden fuld opladning"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appforbrug"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ikke-optimeret"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ikke-optimeret"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimeret batteriforbrug"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4c1e519..f6bab5d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1342,7 +1342,7 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Kein Tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Über \"Hotspot und Tethering\" kannst du für andere Geräten über das Mobilfunknetz eine Internetverbindung freigeben."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Über \"Hotspot und Tethering\" kannst du für andere Geräte über das Mobilfunknetz eine Internetverbindung freigeben."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilfunknetz"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilfunktarif"</string>
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil eine App die Berechtigungsanfrage verdeckt."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Deine Aktion kann von \"Einstellungen\" nicht bearbeitet werden, weil eine andere App über diesen Optionen angezeigt wird."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Wenn du <xliff:g id="SERVICE">%1$s</xliff:g> aktivierst, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Da du eine Bedienungshilfe aktiviert hast, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Muster bestätigen."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"vor <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"App-Verbrauch seit letzter vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Gerätenutzung seit vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Aktivierungsdauer des Displays seit letzter vollständiger Aufladung"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Gerätenutzung seit letzter vollständiger Aufladung"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Seit <xliff:g id="TIME">^1</xliff:g> verwendet"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Displaynutzung: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<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="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Benachrichtigungen"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Erweitert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Geschäftliche Benachrichtigungen"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Logosymbole zulassen"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinklicht"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Auf dem Sperrbildschirm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Benachrichtigungsinhalt anzeigen"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Kategorien gelöscht</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Kategorie gelöscht</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Benachrichtigungskennzeichen"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aktiviert"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Deaktiviert"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Logosymbol erlauben"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Auf dem Sperrbildschirm"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akku-Optimierung"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Alle Apps anzeigen"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Weitere Apps ausblenden"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung zeigen"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"App-Nutzung zeigen"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nicht optimiert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nicht optimiert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkuverbrauch optimiert"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 40c936d..5ffe66d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> απαιτεί τα εξής:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Επειδή μια εφαρμογή αποκρύπτει ένα αίτημα άδειας, δεν είναι δυνατή η επαλήθευση της απάντησής σας από τις Ρυθμίσεις."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Η ενότητα Ρυθμίσεις δεν μπορεί να αποκριθεί στην ενέργειά σας καθώς εμφανίζεται μία άλλη εφαρμογή πάνω από αυτές τις επιλογές."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Εάν ενεργοποιήσετε την υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Επειδή έχετε ενεργοποιήσει την υπηρεσία προσβασιμότητας, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε το μοτίβο σας."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Πριν από <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Χρήση εφ/γών από πλ. φόρτ. (πριν <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Χρήση της συσκευής από την πλήρη φόρτιση (πριν από <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Χρόνος ενεργοποίησης της οθόνης από την πλήρη φόρτιση"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Χρήση της συσκευής από την πλήρη φόρτιση"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Χρήση μπαταρίας από τη στιγμή της αποσύνδεσης από την τροφοδοσία"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Χρησιμοποιείται για <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Χρήση οθόνης: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> χρησιμοποιείται από: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> της συνολικής μπαταρίας"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ανάλυση από την τελευταία πλήρη φόρτιση"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Ειδοποιήσεις"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Σύνθετες ρυθμίσεις"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ειδοποιήσεις εργασίας"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Αποδοχή σημάτων εικονιδίων"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Φως που αναβοσβήνει"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Στο κλείδωμα οθόνης"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Εμφάνιση όλου του περιεχ. ειδοπ."</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> κατηγορίες διαγράφηκαν</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> κατηγορία διαγράφηκε</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Σήματα ειδοποιήσεων"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ενεργές"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Ανενεργές"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Αποκλεισμός όλων"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Να μην εμφανίζονται ποτέ αυτές οι ειδοποιήσεις"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Εμφάνιση ειδοποιήσεων"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Να μην εμφανίζονται ποτέ ειδοποιήσεις στο πλαίσιο σκίασης ειδοποιήσεων ή σε περιφερειακές συσκευές"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Να επιτρέπεται το σήμα εικονιδίου"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Παράκαμψη λειτουργίας \"Μην ενοχλείτε\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Να επιτραπεί σε αυτές τις ειδοποιήσεις να εξακολουθήσουν να διακόπτουν τη λειτουργία \"Μην ενοχλείτε\" όταν έχει οριστεί σε Μόνο προτεραιότητας"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Στο κλείδωμα οθόνης"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Βελτ/ποίηση μπαταρίας"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Ειδοποιήσεις χρήσης"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Εμφάνιση όλων των εφαρμογών"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Απόκρυψη επιπλέον εφαρμογών"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Εμφάνιση πλήρους χρήσης συσκευής"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Εμφάνιση χρήσης εφαρμογής"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Χωρίς βελτιστοποίηση"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Χωρίς βελτιστοποίηση"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Βελτιστοποίηση χρήσης μπαταρίας"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a13d0da..4ee6ff5 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Because another app is displaying on top of these options, Settings can’t respond to your action."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Allow icon badges"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Notification badges"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Allow icon badge"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -3005,7 +3007,7 @@
     <string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
     <string name="change" msgid="6657848623929839991">"Change"</string>
     <string name="change_storage" msgid="600475265207060436">"Change storage"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"App notifications."</string>
+    <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Battery optimisation"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a13d0da..4ee6ff5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Because another app is displaying on top of these options, Settings can’t respond to your action."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Allow icon badges"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Notification badges"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Allow icon badge"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -3005,7 +3007,7 @@
     <string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
     <string name="change" msgid="6657848623929839991">"Change"</string>
     <string name="change_storage" msgid="600475265207060436">"Change storage"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"App notifications."</string>
+    <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Battery optimisation"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a13d0da..4ee6ff5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Because another app is displaying on top of these options, Settings can’t respond to your action."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Allow icon badges"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Notification badges"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Allow icon badge"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -3005,7 +3007,7 @@
     <string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
     <string name="change" msgid="6657848623929839991">"Change"</string>
     <string name="change_storage" msgid="600475265207060436">"Change storage"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"App notifications."</string>
+    <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Battery optimisation"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 050eff9..9f8a191 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"La app de Configuración no puede procesar tu acción porque otra app se muestra sobre estas opciones."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Dado que activaste un servicio de accesibilidad, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar el patrón."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la última carga (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso del dispositivo desde carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que estuvo encendida la pantalla desde la última carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Se usó durante <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uso de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanzada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permitir insignias de íconos"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla bloqueada"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
@@ -2852,14 +2852,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías borradas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría borrada</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Insignias de notificaciones"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activada"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Inhabilitado"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar notificaciones en el panel ni en dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permitir insignia de ícono"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No molestar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No molestar esté configurado como Solo prioridad"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla bloqueada"</string>
@@ -3092,8 +3094,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimización de la batería"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas las apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps adicionales"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sin optimizar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 30c8c25..a3f0fbe 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Una aplicación está bloqueando una solicitud de permiso, por lo que Ajustes no puede verificar tu respuesta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"La aplicación Ajustes no puede responder a tu acción porque otra aplicación tapa estas opciones."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Has activado un servicio de accesibilidad, por lo que el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu patrón."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso del dispositivo desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que la pantalla ha estado encendida desde la carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"En uso durante <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uso de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> del total de batería"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -2305,7 +2304,7 @@
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincr. autom. datos trabajo"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar ciclo…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Día del mes para restablecer ciclo de uso de datos:"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"Ninguna aplicación ha usado datos en este período."</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"Ninguna aplicación ha usado datos en este periodo."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primer plano"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"con restricción"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Opciones avanzadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permitir insignias de iconos"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz parpadeante"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla de bloqueo"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de las notificaciones"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías eliminadas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría eliminada</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Insignias de notificaciones"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activadas"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desactivadas"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar nunca estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar nunca notificaciones en el panel de notificaciones ni en dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permitir insignia de icono"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Priorizar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla de bloqueo"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimización de batería"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas las aplicaciones"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicaciones extra"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de la aplicación"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimizada"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index d3f4413..b1b40e4 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> teeb järgmist:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Seaded ei saa teie vastust kinnitada, sest rakendus varjab loataotlust."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Menüü Seaded ei saa teie toimingule reageerida, kuna muu rakendus on kuvatud nende valikute peal."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kui lülitate sisse teenuse <xliff:g id="SERVICE">%1$s</xliff:g>, ei kasuta seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kuna lülitasite sisse juurdepääsetavuse teenuse, siis ei kasuta teie seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma mustri."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> tagasi"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Rakenduste kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Seadme kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ekraani töötamise aeg alates viimasest täislaadimisest"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Seadme kasutus alates viimasest täislaadimisest"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Kasutatud <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ekraanikasutus: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> kasutab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kogu akumahust"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Üksikasjalik teave alates viimasest täislaadimisest"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Märguanded"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Täpsemad"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Töö märguanded"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Ikoonimärgi lubamine"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Vilkuv tuli"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukustuskuval"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Kuva kogu märguande sisu"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategooriat on kustutatud</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategooria on kustutatud</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Märguannete märgid"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Sees"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Väljas"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ära kunagi näita neid märguandeid"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Kuva märguanded"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ära kuva märguandeid kunagi märguandealal ega välisseadmetes"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Ikoonimärgi lubamine"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Funktsiooni Mitte segada alistamine"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukustuskuval"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Aku optimeerimine"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Teated kasutuse kohta"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Kõigi rakenduste kuvamine"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Lisarakenduste peitmine"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Kuva seadme kogu kasutusteave"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Kuva rakenduse kasutusteave"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Pole optimeeritud"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Pole optimeeritud"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akukasutuse optimeerimine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 287d173..5739964 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili nahi duzu?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hauek egin behar ditu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Aukera hauen gainean beste aplikazio bat ageri denez, \"Ezarpenak\" atalak ezin du egin eskatu diozuna."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktibatzen baduzu, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Erabilerraztasun-zerbitzua aktibatu duzunez, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, eredua berretsi behar duzu."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Duela <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Aplikazioen erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Gailuaren erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Gailua guztiz kargatu zenetik pantaila piztuta egon den denbora"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Gailuaren erabilera hura guztiz kargatu zenetik"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Erabilera-denbora: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Pantailaren erabilera: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> erabili du <xliff:g id="APP">%2$s</xliff:g> aplikazioak"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Bateria osoaren <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zenetik emandako erabileraren datuak"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Jakinarazpenak"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Ezarpen aurreratuak"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Laneko jakinarazpenak"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Baimendu ikonoen bereizgarriak"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Argi keinukaria"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pantaila blokeatuan"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Erakutsi jakinarazpenen eduki guztia"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategoria ezabatu dira</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategoria ezabatu da</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Jakinarazpenen bereizgarriak"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aktibatuta"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desaktibatuta"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ez erakutsi jakinarazpen hauek inoiz"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Erakutsi jakinarazpenak"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ez erakutsi inoiz jakinarazpenak edo ilundutako eremuetan edo gailu osagarrietan"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Baimendu ikonoaren bereizgarria erabiltzea"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Ez molestatu\" moduaren salbuespenak"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pantaila blokeatuan"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Bateria-optimizazioa"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-abisuak"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Erakutsi aplikazio guztiak"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ezkutatu aplikazio gehigarriak"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Erakutsi gailuaren erabilera guztia"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Erakutsi aplikazioaren erabilera"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Optimizaziorik gabe"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Optimizaziorik gabe"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Bateria-optimizazioa aplikatzen da"</string>
@@ -3107,7 +3109,7 @@
     <string name="battery_power_management" msgid="5571519699679107523">"Bateriaren kudeaketa"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Ez du bateriarik erabili bateria guztiz kargatu zenetik"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Aplikazioaren ezarpenak"</string>
-    <string name="system_ui_settings" msgid="579824306467081123">"Erakutsi sistemako UI konfiguratzailea"</string>
+    <string name="system_ui_settings" msgid="579824306467081123">"Erakutsi sistemako erabiltzaile-interfazearen konfiguratzailea"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"Baimen gehigarriak"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Beste <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"Akatsen txostena partekatu nahi duzu?"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b6d68da..e87a53c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"چون برنامه‌ای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمی‌تواند پاسخ شما را تأیید کند."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"چون در این لحظه برنامه دیگری روی این گزینه‌ها نشان داده می‌شود، «تنظیمات» نمی‌تواند به اقدام شما پاسخ دهد."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر <xliff:g id="SERVICE">%1$s</xliff:g> را روشن کنید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"از آنجا که یک سرویس دسترس‌پذیری را روشن کرده‌اید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر می‌گذارد، باید الگویتان را تأیید کنید."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"مصرف برنامه از زمان شارژ کامل (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"مصرف دستگاه از زمان شارژ کامل (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"مدت‌زمان مصرف صفحه‌نمایش از زمان شارژ کامل"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"مصرف دستگاه از زمان شارژ کامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"مدت‌ زمان استفاده <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"مصرف صفحه‌نمایش <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> از شارژ باتری را مصرف کرده است"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> از کل شارژ باتری"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفکیک مصرف شارژ از زمان آخرین شارژ کامل"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"اعلان‌ها"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"پیشرفته"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"اعلان‌های کار"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"اجازه دادن به نشان‌های نماد"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"نور چشمک‌زن"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"روی قفل صفحه"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"نمایش همه محتوای اعلان"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> دسته حذف‌ شد</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> دسته حذف‌ شد</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"نشان‌های اعلان"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"روشن"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"خاموش"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"هرگز این اعلان‌ها نشان داده نشوند"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"نمایش اعلان‌ها"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"هرگز اعلان‌ها در کشوی اعلانات یا در دستگاه‌های جانبی نشان داده نشوند"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"نشان نماد مجاز است"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"لغو «مزاحم نشوید»"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"به این اعلان‌ها اجازه داده شود در شرایطی که «مزاحم نشوید» روی «فقط اولویت‌دار» تنظیم شده است، همچنان وقفه ایجاد کنند"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"در قفل صفحه"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"بهینه‌سازی مصرف باتری"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"هشدارهای استفاده"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"نمایش همه برنامه‌ها"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"پنهان کردن برنامه‌های اضافی"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"نمایش اطلاعات کامل درباره مصرف دستگاه"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"نمایش مصرف برنامه"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بهینه‌نشده"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بهینه نشده"</string>
     <string name="high_power_off" msgid="3393904131961263278">"بهینه‌سازی مصرف باتری"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d3e381b..e599689 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> saa luvan:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Sovellus peittää lupapyynnön, joten Asetukset ei voi vahvistaa valintaasi."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Toinen sovellus peittää nämä asetukset, joten Asetukset ei voi reagoida toimintoosi."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jos <xliff:g id="SERVICE">%1$s</xliff:g> otetaan käyttöön, laitteesi ei käytä näytön lukitusta tiedon salauksen parantamiseen."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Laite ei käytä näytön lukitusta tiedon salauksen parantamiseen, koska otit käytettävyyspalvelun käyttöön."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa kuvio."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sitten"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Näytön käyttöaika edellisen täyden latauksen jälkeen"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Laitteen käyttö edellisen täyden latauksen jälkeen"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Käyttöaika: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Näytön käyttö <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> on käyttänyt <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kaikesta virrankulutuksesta"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Erittely edellisen täyden latauksen jälkeen"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Ilmoitukset"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Lisäasetukset"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Työilmoitukset"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Salli merkkikuvakkeet"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Vilkuta valoa"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukitusnäytöllä"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö."</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> luokkaa poistettu</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> luokka poistettu</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Ilmoitusmerkit"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Käytössä"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Pois käytöstä"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Älä koskaan näytä näitä ilmoituksia"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Näytä ilmoitukset"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Älä näytä ilmoituksia ilmoitusalueella tai lisälaitteissa"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Salli merkkikuvake"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ohita Älä häiritse -asetus"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Salli ilmoituksien näyttö, vaikka Älä häiritse -asetus on Vain tärkeät."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukitusnäytöllä"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akun käytön optimointi"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Käyttöilmoitukset"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Näytä kaikki sovellukset"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Piilota ylimääräiset"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Näytä kaikki laitteen käyttö"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Näytä sovelluksen käyttö"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ei optimointia"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ei optimointia"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akun käyttöä optimoidaan."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 643ba34..61a2a2d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Une application obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"L\'application Paramètres ne peut pas répondre à votre action, car une autre application se superpose à ces options."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre schéma."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applis depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Durée que l\'écran a été actif depuis la dernière charge complète"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Utilisation de l\'écran : <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale de la pile"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Autoriser les insignes d\'icône"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Faire clignoter le voyant"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"À l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Badges de notification"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activées"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Désactivées"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans l\'ombre ou sur des appareils périphériques"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Autoriser l\'insigne de l\'icône"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode « Ne pas déranger »"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"À l\'écran de verrouillage"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimisation de la pile"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Afficher toutes les applis"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Masquer applis supplémentaires"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation totale de l\'appareil"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation des applis"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisée"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
     <string name="high_power_off" msgid="3393904131961263278">"L\'utilisation de la pile est optimisée"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 37ebc56..cce11c9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Une application masque la demande d\'autorisation. Impossible de valider votre réponse via l\'application Paramètres."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"L\'application Paramètres ne peut pas répondre à votre action, car une autre application se superpose à ces options."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Vous devez confirmer le schéma, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilisation de l\'appareil depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Durée d\'activation de l\'écran depuis la charge complète"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Utilisation de l\'écran : <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batterie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications profil pro"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Autoriser les badges d\'icône"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Clignotement"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sur l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Badges de notification"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activées"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Désactivées"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans le volet ou sur les périphériques"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Autoriser le badge de l\'icône"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer l\'option \"Ne pas déranger\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Autoriser les interruptions par ces notifications lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sur l\'écran de verrouillage"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimisation de la batterie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Afficher toutes les applications"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Masquer applis supplémentaires"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation de l\'appareil chargé"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation appli"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisées"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Utilisation de la batterie optimisée"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6fbe87c..b7a2391 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Posto que unha aplicación se superpón sobre una solicitude de permiso, a configuración non pode verificar a túa resposta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Móstrase outra aplicación enriba destas opcións. Por este motivo, non se aplican os cambios que fagas en Configuración."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se activas <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Como activaches un servizo de accesibilidade, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"É necesario que confirmes o teu padrón xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Busca da rede de telefonía móbil"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o que a pantalla estivo activada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da batería desde que se desconectou"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Tempo de utilización: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Análise detallada desde a última carga completa"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacións"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Configuración avanzada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacións do traballo"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permitir insignias de iconas"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na pantalla de bloqueo"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o contido das notificacións"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías eliminadas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría eliminada</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Insignias de notificación"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activado"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desactivado"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrar nunca estas notificacións"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificacións"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostra nunca as notificacións no menú despregable da parte superior da pantalla nin en dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permitir insignia de icona"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular opción Non molestar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificacións sigan interrompendo cando a opción Non molestar estea configurada como Só prioridade"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na pantalla de bloqueo"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimización da batería"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas as aplicacións"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicacións adicionais"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo do dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso da aplicación"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sen optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sen optimizar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando o uso da batería"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 9fe94a8..a6775c8 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ને આની જરૂર છે:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"એક ઍપ્લિકેશન પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ્સ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"બીજી ઍપ્લિકેશન આ વિકલ્પોની ઉપર પ્રદર્શિત થતી હોવાને કારણે, સેટિંગ્સ તમારી ક્રિયાનો પ્રતિભાવ આપી શકતી નથી."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"જો તમે <xliff:g id="SERVICE">%1$s</xliff:g> ચાલુ કરો છો, તો તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"તમે અ‍ૅક્સેસિબિલિટી સેવા ચાલુ કરી હોવાને કારણે, તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારી પેટર્નની પુષ્ટિ કરવાની જરૂર છે."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> પહેલાં"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"સંપૂર્ણ ચાર્જ પછી ઍપ્લિકેશન વપરાશ (<xliff:g id="TIME">^1</xliff:g> પહેલાં)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"સંપૂર્ણ ચાર્જ કર્યા પછી ઉપકરણનો વપરાશ (<xliff:g id="TIME">^1</xliff:g> પહેલાં)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"સંપૂર્ણ ચાર્જ પછી સ્ક્રીન ચાલુ રહેવાનો સમયગાળો"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"સંપૂર્ણ ચાર્જ પછી ઉપકરણ વપરાશ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"અનપ્લગ થયું ત્યારથી બૅટરી ઉપયોગ"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> સુધી ઉપયોગ કરાયો"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"સ્ક્રીન વપરાશ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> દ્વારા <xliff:g id="PERCENT">%1$s</xliff:g> વપરાયું"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"કુલ બૅટરીનું <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"છેલ્લા સંપૂર્ણ ચાર્જ પછીનું વિશ્લેષણ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"સૂચનાઓ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"વિગતવાર"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"કાર્યની સૂચનાઓ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"આઇકનના બૅજને મંજૂરી આપો"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"લાઇટ ઝબકવી"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"લૉક સ્ક્રીન પર"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ સૂચના સામગ્રી બતાવો"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> કૅટેગરી કાઢી નાખી</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> કૅટેગરી કાઢી નાખી</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"સૂચના બૅજ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ચાલુ"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"બંધ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"તમામને અવરોધિત કરો"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"આ સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"સૂચનાઓ બતાવો"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"સૂચનાઓ ક્યારેય શૅડમાં અથવા પેરિફેરલ ઉપકરણો પર બતાવશો નહીં"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"આઇકન બૅજની મંજૂરી આપો"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ખલેલ પાડશો નહીં ને ઓવરરાઇડ કરો"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"જયારે ખલેલ પાડશો નહીં ને માત્ર પ્રાધાન્યતા પર સેટ કરેલું હોય ત્યારે આ સૂચનાઓને દખલગીરી કરવા દો"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"લૉક સ્ક્રીન પર"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"બૅટરી ઓપ્ટિમાઇઝેશન"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"વપરાશ સંબંધી ચેતવણીઓ"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"બધી ઍપ્લિકેશનો બતાવો"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"વધારાની ઍપ્લિકેશનો છુપાવો"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ઉપકરણનો સંપૂર્ણ વપરાશ બતાવો"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ઍપ્લિકેશનનો વપરાશ બતાવો"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
     <string name="high_power_off" msgid="3393904131961263278">"બૅટરી વપરાશને ઓપ્ટિમાઇઝ કરી રહ્યું છે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 253b10b..8292e5a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह आवश्यक है:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"चूंकि एक ऐप अनुमति के अनुरोध को अस्पष्ट बना रहा है, इसलिए सेटिंग आपके प्रतिसाद को सत्यापित नहीं कर पा रही हैं."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"चूंकि दूसरा ऐप्लिकेशन इन विकल्पों के ऊपर दिखाई दे रहा है, इसलिए सेटिंग आपकी कार्रवाई का जवाब नहीं दे सकती हैं."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"क्योंकि आपने सरल उपयोग सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पहले"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"पूरी तरह से चार्ज होने के बाद से अब तक का ऐप्लिकेशन उपयोग (<xliff:g id="TIME">^1</xliff:g> पहले)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"डिवाइस के पूरी तरह चार्ज होने (<xliff:g id="TIME">^1</xliff:g> पहले) के बाद से अब तक का उपयोग"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पिछली बार पूरी तरह चार्ज होने के बाद से अब तक स्क्रीन के चालू रहने का समय"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"पिछली बार पूरी चार्ज होने के बाद से अब तक का डिवाइस उपयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्‍लग होने के बाद से बैटरी का उपयोग"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> के लिए उपयोग किया गया"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रीन उपयोग <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> उपयोग किया है"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"पूरी बैटरी का <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पूरी तरह चार्ज होने के बाद से अब तक का विश्लेषण"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"नोटिफ़िकेशन"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"उन्नत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्य नोटिफ़िकेशन"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"आइकन बैज की अनुमति दें"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीन पर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी नोटिफ़िकेशन सामग्री दिखाएं"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणियां हटाई गईं</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणियां हटाई गईं</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"नोटिफ़िकेशन बैज"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"चालू"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"बंद"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ये नोटिफिकेशन कभी ना दिखाएं"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"नोटिफ़िकेशन दिखाएं"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"नोटिफ़िकेशन कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"आइकन बैज की अनुमति दें"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान ना करें को ओवरराइड करें"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब परेशान ना करें को केवल प्राथमिकता पर सेट किया गया हो, तब इन नोटिफिकेशन को बाधित करते रहने दें"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीन पर"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"बैटरी ऑप्‍टिमाइज़ेशन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"उपयोग संबंधी सूचनाएं"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"सभी ऐप दिखाएं"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त ऐप छिपाएं"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"डिवाइस का पूरा उपयोग दिखाएं"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ऐप्लिकेशन का उपयोग दिखाएं"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्‍टिमाइज़ नहीं किया गया"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्‍टिमाइज़ नहीं किया गया"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बैटरी उपयोग ऑप्‍टिमाइज़ किया जा रहा है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8b66fcd..0e245d4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1874,7 +1874,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba sljedeće:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Budući da aplikacija prekriva zahtjev za dopuštenje, Postavke ne mogu potvrditi vaš odgovor."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Neka druga aplikacija prikazuje se iznad tih opcija, pa Postavke ne mogu reagirati na vašu radnju."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Budući da ste uključili uslugu pristupačnosti, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi uzorak."</string>
@@ -1935,6 +1934,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"prije <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Upotreba aplikacija od pune baterije (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Upotreba uređaja od potpunog punjenja (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena dok je zaslon bio uključen od posljednjeg punjenja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Upotreba uređaja od potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
@@ -2026,8 +2026,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Upotrebljava se <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Upotreba zaslona <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> upotrebljava <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne potrošnje baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razrada od posljednjeg potpunog punjenja"</string>
@@ -2806,7 +2805,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obavijesti"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavijesti s radnog profila"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Dopusti značke ikona"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Trepereće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom zaslonu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
@@ -2884,14 +2884,16 @@
       <item quantity="few">Izbrisane su <xliff:g id="COUNT_1">%d</xliff:g> kategorije</item>
       <item quantity="other">Izbrisano je <xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Značke za obavijesti"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Uključene"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Isključene"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikad ne prikazuj te obavijesti"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavijesti"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavijesti na zaslonu obavijesti ili na perifernim uređajima"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Dopusti značku ikone"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom zaslonu"</string>
@@ -3130,8 +3132,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja o upotrebi"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Pokaži sve aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Prikaži potpunu upotrebu uređaja"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži upotrebu aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nije optimizirano"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimizirano"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimiziranje upotrebe baterije"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6d64af7..27ed2be 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Használja a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatásnak a következőkre van szüksége:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Mivel az egyik alkalmazás zavar egy engedélykérelmet, a Beállítások funkció nem tudja ellenőrizni az Ön válaszát."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Mivel egy másik alkalmazás jelenik meg a beállítások felett, a Beállítások alkalmazás nem tud válaszolni a műveletre."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ha engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Mivel engedélyezett egy kisegítő szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie mintáját."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Ennyi ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Használat teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Eszközhasználat a teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Képernyőidő teljes töltés óta"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Eszközhasználat teljes feltöltés óta"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Használat ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Képernyőhasználat: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"A(z) <xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-ot használt"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Az akkumulátor teljes töltöttségi szintjének <xliff:g id="PERCENT">%1$s</xliff:g>-a"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Statisztikák az utolsó teljes feltöltés óta"</string>
@@ -2781,7 +2780,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Értesítések"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Speciális"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Munkahelyi profil értesítései"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Ikonjelvények engedélyezése"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Villogó fény"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A lezárási képernyőn"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Az összes értesítés jelenjen meg"</string>
@@ -2856,14 +2856,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategória törölve</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategória törölve</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Értesítésjelvények"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Bekapcsolva"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Kikapcsolva"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Soha ne jelenjenek meg ezek az értesítések"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Értesítések megjelenítése"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Soha ne jelenjen meg értesítés az értesítési felületen és a perifériás eszközökön"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Ikonjelvény engedélyezése"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"A Ne zavarjanak mód felülbírálása"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"A Ne zavarjanak mód „Csak prioritásos” beállítása esetén ezek az értesítések továbbra is zavarhatnak"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A lezárási képernyőn"</string>
@@ -3096,8 +3098,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akkumulátoroptimalizálás"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Használati értesítések"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Összes alkalmazás mutatása"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"További alkalmazások elrejtése"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Teljes eszközhasználat megjelenítése"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Alkalmazáshasználat mutatása"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nincs optimalizálva"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nincs optimalizálva"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkumulátorhasználat optimalizálása"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 13ef3c3..002766b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -926,7 +926,7 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Համրեցնել երաժշտությունը &amp; այլ մեդիան"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Խլացնել ծանուցումները"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Համրեցնել ահազանգերը"</string>
-    <string name="dock_settings" msgid="1820107306693002541">"Միակցել"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Կայան"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Հարակցման կարգավորումներ"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Աուդիո"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Կցված աշխատասեղանի համակցման կարգավորումներ"</string>
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ին անհրաժեշտ է`"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Քանի որ ներածումն արգելափակված է ինչ-որ հավելվածի կողմից, Կարգավորումները չեն կարող հաստատել ձեր պատասխանը:"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Քանի որ այս ընտրանքների վրա ցուցադրվում է մեկ այլ հավելված, Կարգավորումները չեն կարող արձագանքել ձեր գործողությանը:"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Եթե ​​միացնեք <xliff:g id="SERVICE">%1$s</xliff:g>-ը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Քանի որ միացրել եք մատչելիության ծառայությունը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների կոդավորմանը, դուք պետք է հաստատեք ձեր ապակողպման նախշը:"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> առաջ"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Հավելվածների օգտագործումը լրիվ լիցքավորումից հետո (<xliff:g id="TIME">^1</xliff:g> առաջ)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Սարքի օգտագործումը լրիվ լիցքավորումից հետո (<xliff:g id="TIME">^1</xliff:g> առաջ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ժամանակը, որի ընթացքում էկրանը միացած է եղել լրիվ լիցքավորումից հետո"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Սարքի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Մարտկոցի օգտագործման չափը անջատումից հետո"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Օգտագործվել է <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"էկրանի օգտագործում՝ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> օգտագործվել է <xliff:g id="APP">%2$s</xliff:g> հավելվածի կողմից"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Մարտկոցի ընդհանուր լիցքի <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Օգտագործումը վերջին լիցքավորումից հետո"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Ծանուցումներ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Լրացուցիչ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Աշխատանքային ծանուցումներ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Թույլատրել պատկերակների նշանակները"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Թարթող լույս"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Կողպէկրանին"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ամբողջ ծանուցումը"</string>
@@ -2828,10 +2828,10 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Երբ սարքը գտնվում է VR ռեժիմում"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Նվազեցնել շաղումը (խորհուրդ է տրվում)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Նվազեցնել թարթումը"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Նկարը նկարի մեջ"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Տեղադրված հավելվածներից ոչ մեկը չի աջակցում Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"նկարը նկարի մեջ, նկար, ննմ"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկարը նկարի մեջ"</string>
+    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Թույլատրել «նկարը նկարի մեջ» ռեժիմը"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Թույլ տալ այս հավելվածին ստեղծել «նկարը նկարի մեջ» պատուհան՝ երբ հավելվածը բաց է կամ այն լքելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Այո"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other">Ջնջվել է <xliff:g id="COUNT_1">%d</xliff:g> կատեգորիա</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Ծանուցման նշանակներ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Միացված է"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Անջատված է"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Երբեք չցուցադրել այս ծանուցումները"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Ցուցադրել ծանուցումները"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Երբեք չցուցադրել ծանուցումները ստվերում կամ արտաքին սարքերի վրա"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Թույլատրել պատկերակի նշանակը"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չանհանգստացնել» պարամետրը"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չանհանգստացնել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Կողպէկրանին"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Մարտկոցի օպտիմալացում"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Օգտագործման զգուշացումներ"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Ցուցադրել բոլոր հավելվածները"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Թաքցնել լրացուցիչ հավելվածները"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Ցույց տալ ամբողջ սարքի օգտագործումը"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Ցույց տալ հավելվածների օգտագործումը"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Չեն տնտեսում լիցքը"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Չօպտիմալացված"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Մարտկոցի սպառման օպտիմալացում"</string>
@@ -3470,9 +3472,9 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ծանուցումներն արագ տեսնելու համար վերցրեք պլանշետը:"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Ծանուցումներն արագ տեսնելու համար վերցրեք սարքը:"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետնամասում գտնվող մատնահետքերի սկաների վրա"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ծանուցումները տեսնելու համար պլանշետի հետնամասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ծանուցումները տեսնելու համար սարքի հետնամասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ծանուցումները տեսնելու համար պլանշետի հետևի մասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ծանուցումները տեսնելու համար սարքի հետևի մասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Օժանդակ ժեստ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Զգայունություն"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b18dbab..05aebe4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -922,9 +922,9 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Nada dering &amp; notifikasi"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Notifikasi"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarm"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"Bisukan nada dering &amp; notifikasi"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Matikan nada dering &amp; notifikasi"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Bisukan musik &amp; media lain"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"Bisukan notifikasi"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Matikan notifikasi"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Bisukan alarm"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Setelan dok"</string>
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Karena sebuah aplikasi menghalangi permintaan izin, Setelan tidak dapat memverifikasi tanggapan Anda."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Karena aplikasi lain muncul di atas opsi ini, Setelan tidak dapat merespons tindakan Anda."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika Anda mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g>, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Karena Anda telah mengaktifkan layanan aksesibilitas, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi pola."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan aplikasi sejak pengisian baterai terakhir hingga penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Penggunaan perangkat sejak baterai diisi penuh (<xliff:g id="TIME">^1</xliff:g> lalu)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah waktu layar diaktifkan sejak pengisian daya terakhir hingga penuh"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan perangkat sejak pengisian baterai penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Penggunaan layar <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dari seluruh penggunaan baterai"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Penggunaan sejak pengisian baterai terakhir hingga penuh"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifikasi"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Lanjutan"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifikasi kerja"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Izinkan badge ikon"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Cahaya kedip"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Di layar kunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Menampilkan semua konten notifikasi"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori dihapus</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori dihapus</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Badge notifikasi"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aktif"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Nonaktif"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Jangan pernah tampilkan notifikasi ini"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Tampilkan notifikasi"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan pernah tampilkan notifikasi di bayangan atau di perangkat periferal"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Izinkan badge ikon"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ganti mode Jangan Ganggu"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Di layar kunci"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Pengoptimalan baterai"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Tampilkan semua aplikasi"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan aplikasi ekstra"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan penggunaan perangkat penuh"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimalkan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimalkan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Mengoptimalkan penggunaan baterai"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 9f79906..73cd12f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Nota <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> þarf að:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Stillingar geta ekki staðfest svarið þitt vegna þess að forrit er að fela heimildarbeiðni."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Stillingar geta ekki brugðist við aðgerðinni því að annað forrit er birt yfir þessum valkostum."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ef þú kveikir á <xliff:g id="SERVICE">%1$s</xliff:g> mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Þar sem þú hefur kveikt á aðgengisþjónustu mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta mynstrið þitt."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Notkun forrita frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Notkun tækis frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Liðinn tími frá síðustu fullu hleðslu"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tækjanotkun frá síðustu fullu hleðslu"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Rafhlöðunotkun frá síðustu hleðslu"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Notað fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Skjánotkun <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> notuð af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af heildarrafhlöðuorku"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Greining frá síðustu fullu hleðslu"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Tilkynningar"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Ítarlegt"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Vinnutilkynningar"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Leyfa merkingu á skjöldum"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikkandi ljós"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Á lásskjá"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Sýna allt innihald tilkynninga"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> flokki eytt</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> flokkum eytt</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Tilkynningaskildir"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Kveikt"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Slökkt"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Aldrei sýna þessar tilkynningar"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Sýna tilkynningar"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Aldrei sýna tilkynningar í skugga eða á jaðartækjum"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Leyfa merkingu á tákni"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Hnekkja „Ónáðið ekki“"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Láta þessar tilkynningar halda áfram að trufla þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Á lásskjá"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Rafhlöðusparnaður"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Notkunartilkynningar"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Sýna öll forrit"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Fela aukaforrit"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Sýna alla notkun tækis"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Sýna forritanotkun"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Enginn sparnaður"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Enginn sparnaður"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Sparar rafhlöðunotkun"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f27dca5..3ac27fc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> deve:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Un\'app sta oscurando una richiesta di autorizzazione, pertanto Impostazioni non può verificare la tua risposta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Impostazioni non può rispondere alla tua azione perché c\'è un\'altra app visualizzata sopra queste opzioni."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se attivi <xliff:g id="SERVICE">%1$s</xliff:g>, il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati perché hai attivato un servizio di accessibilità."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare la sequenza."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> fa"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizzo dell\'app dall\'ultima ricarica (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilizzo del dispositivo dall\'ultima ricarica completa (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo per cui la schermata è rimasta attiva dalla ricarica completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizzo del dispositivo dall\'ultima ricarica completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Usato per <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uso dello schermo: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizzato da <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dell\'utilizzo totale della batteria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analisi dettagliata dall\'ultima ricarica completa"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifiche"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanzate"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifiche di lavoro"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Consenti badge icona"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luce lampeggiante"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sulla schermata di blocco"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti delle notifiche"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie eliminate</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminata</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Badge di notifica"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Non attive"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrare mai queste notifiche"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notifiche"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostrare mai notifiche nella relativa area o su dispositivi periferici"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Attiva badge icona"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora Non disturbare"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sulla schermata di blocco"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Ottimizzazione batteria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Avvisi sul livello di carica"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostra tutte le app"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Nascondi app extra"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostra utilizzo completo del dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostra utilizzo delle app"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Senza ottimizzazione"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Senza ottimizzazione"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Uso della batteria ottimizzato"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 266387d..f452830 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -374,20 +374,20 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטלפון."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ברצוני לדלג בכל זאת"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"חזרה"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"אתר את החיישן"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"איתור החיישן"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"אתר את חיישן טביעת האצבע בגב הטלפון."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"איור המציג את המיקום של חיישן טביעת האצבע במכשיר"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"שם"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"אישור"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחיקה"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"אפשר להתחיל"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"קדימה, נתחיל"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"הזז מעט את האצבע כדי להוסיף את כל החלקים של טביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"טביעת האצבע נוספה!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"גע בחיישן טביעת האצבע כדי להוציא את המכשיר ממצב שינה ולבטל את הנעילה שלו."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"כשהסמל הזה מוצג לך, פירוש הדבר הוא שאתה יכול גם לאשר רכישות או להיכנס לאפליקציות."</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"כשהסמל הזה מופיע, פירוש הדבר הוא שאפשר גם לאשר רכישות או להיכנס לאפליקציות."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"האם לדלג על הגדרת טביעת אצבע?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"בחרת להשתמש בטביעת האצבע שלך כאחת מהדרכים שבהן תוכל לבטל את הנעילה בטלפון. אם תדלג על שלב זה עכשיו, תצטרך לבצע את ההגדרה בהמשך. ההגדרה לוקחת רק דקה או שתיים."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"הגדר נעילת מסך"</string>
@@ -647,7 +647,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"אפשרויות מתקדמות"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"‏Bluetooth מתקדם"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"‏כש-Bluetooth פועל, יש קשר למכשירי Bluetooth אחרים."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות התקני Bluetooth. תוכל לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות התקני Bluetooth. ניתן לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"התחבר אל…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של המדיה."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של הדיבורית."</string>
@@ -719,7 +719,7 @@
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"התחבר לרשתות פתוחות"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטית לרשתות ציבוריות באיכות גבוהה"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"התקנת אישורים"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות רשתות Wi‑Fi. תוכל לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות רשתות Wi‑Fi. ניתן לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"‏כדי לשפר את דיוק המיקום, הפעל את אפשרות הסריקה אחר רשתות Wi-Fi ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"אל תציג שוב"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‏ה-Wi-Fi ימשיך לפעול בזמן שינה"</string>
@@ -749,7 +749,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"שכח רשת"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏כתוב בתג NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏כדי לראות רשתות זמינות יש להפעיל Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"‏מחפש רשתות Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"‏אין לך הרשאה לשנות את רשת ה-Wi-Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
@@ -1517,7 +1517,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול אפליקציות, הגדרת קיצורי דרך להפעלה מהירה"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות אפליקציה"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
-    <string name="install_applications_title" msgid="4987712352256508946">"התר את כל המקורות לאפליקציות"</string>
+    <string name="install_applications_title" msgid="4987712352256508946">"אפליקציות ממקורות שונים"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"הטאבלט והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטאבלט או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"‏<xliff:g id="SERVICE">%1$s</xliff:g> צריך אפשרות לבצע:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"אפליקציית ההגדרות לא יכולה להגיב לפעולה שלך כי אפליקציה אחרת מופיעה מעל האפשרויות האלה."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"אם תפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"מפני שהפעלת שירות נגישות, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"הפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, לכן עליך לאשר את קו ביטול הנעילה שלך."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"לפני <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"שימוש באפליקציה מאז הטעינה המלאה (לפני <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"השימוש במכשיר מאז הטעינה המלאה האחרונה (לפני <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"משך הזמן שבו המסך פעל מאז הטעינה המלאה"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"שימוש במכשיר מאז הטעינה המלאה"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"צריכת סוללה מאז הניתוק"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"משך השימוש: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"שימוש במסך במשך <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> בשימוש על ידי <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> מצריכת הסוללה הכוללת"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"פירוט מאז הטעינה המלאה האחרונה"</string>
@@ -2835,7 +2834,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"הודעות"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"אפשרויות מתקדמות"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"הודעות עבודה"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"הצגת תגים על גבי הסמלים"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"אור מהבהב"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"במסך הנעילה"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"תוכן ההודעות יופיע במלואו"</string>
@@ -2916,14 +2916,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> קטגוריות נמחקו</item>
       <item quantity="one">קטגוריה <xliff:g id="COUNT_0">%d</xliff:g> נמחקה</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"תגי הודעות"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"מופעל"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"כבוי"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"לעולם אל תציג את ההודעות האלה"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"הצג הודעות"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"אף פעם אל תציג הודעות בהצללה או במכשירים היקפיים"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"הצגת תג על הסמל"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ביטול / שינוי של \'נא לא להפריע\'"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"אפשר להודעות אלה להמשיך ולהפריע כאשר \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"במסך הנעילה"</string>
@@ -3168,8 +3170,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"אופטימיזציה של סוללה"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"התראות על ניצול סוללה"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"הצג את כל האפליקציות"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"הסתר את האפליקציות הנוספות"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"הצג נתונים מלאים על השימוש במכשיר"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"הצג את נתוני השימוש באפליקציה"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"לא בוצעה אופטימיזציה"</string>
     <string name="high_power_on" msgid="6216293998227583810">"לא בוצעה אופטימיזציה"</string>
     <string name="high_power_off" msgid="3393904131961263278">"מבצעת אופטימיזציה לשימוש בסוללה"</string>
@@ -3276,7 +3278,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"יכולות לשנות את הגדרות המערכת"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"שינוי הגדרות המערכת"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"הרשאת אפליקציה לשנות את הגדרות המערכת"</string>
-    <string name="permit_write_settings" msgid="6393779336656870080">"התר שינוי של הגדרות המערכת"</string>
+    <string name="permit_write_settings" msgid="6393779336656870080">"אפשר לשנות את הגדרות המערכת"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"כן"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"לא"</string>
@@ -3581,8 +3583,8 @@
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"הגדרה"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"סנכרן נתונים באופן אוטומטי"</string>
-    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"סנכרן נתונים אישיים באופן אוטומטי"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"סנכרון נתונים באופן אוטומטי"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"סנכרון נתונים אישיים באופן אוטומטי"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"סנכרן נתוני עבודה באופן אוטומטי"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"אפשר לאפליקציות לרענן נתונים באופן אוטומטי"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"סנכרון חשבון"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ba39303..41b3704 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -313,9 +313,9 @@
     <string name="date_picker_title" msgid="1338210036394128512">"日付"</string>
     <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"自動ロック"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"スリープ開始後<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"スリープの開始直後（<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>がロック解除を管理している場合を除く）"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"スリープ開始後<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>がロック解除を管理している場合を除く）"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"スリープ開始後 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"スリープの開始直後（<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> がロック解除を管理している場合を除く）"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"スリープ開始後 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> がロック解除を管理している場合を除く）"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"ロック画面に所有者情報を表示"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"ロック画面メッセージ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ウィジェットの有効化"</string>
@@ -571,8 +571,8 @@
     <string name="manage_device_admin" msgid="537804979483211453">"端末管理アプリ"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"アクティブなアプリはありません"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other">有効なアプリ <xliff:g id="COUNT_1">%d</xliff:g> 個</item>
-      <item quantity="one">有効なアプリ <xliff:g id="COUNT_0">%d</xliff:g> 個</item>
+      <item quantity="other">有効なアプリ: <xliff:g id="COUNT_1">%d</xliff:g> 個</item>
+      <item quantity="one">有効なアプリ: <xliff:g id="COUNT_0">%d</xliff:g> 個</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信頼できるエージェント"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"使用するには、まず画面ロックを設定してください"</string>
@@ -1467,7 +1467,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"プロファイルのパターンを表示する"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"タップ操作時のバイブ"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"電源ボタンですぐにロックする"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>がロック解除を管理している場合を除く"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> がロック解除を管理している場合を除く"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ロック解除パターン設定"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"パターンの変更"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ロック解除パターンの描き方"</string>
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>では以下が必要です。"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"アプリが許可リクエストを隠しているため、設定側でユーザーの応答を確認できません。"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"このオプションに重なって他のアプリが表示されているため、[設定] を操作しても反応しません。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにすると、端末データの暗号化の強化に画面ロックは使用されなくなります。"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ユーザー補助サービスがONに設定されているため、端末データの暗号化の強化に画面ロックは使用されません。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、パターンの確認が必要となります。"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"フル充電（<xliff:g id="TIME">^1</xliff:g>前）以降のアプリの電池使用状況"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"フル充電（<xliff:g id="TIME">^1</xliff:g>前）以降の端末の電池使用状況"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"フル充電以降の画面がオンの時間"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"フル充電以降の端末の電池使用状況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>、使用"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"画面の使用: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"電池使用量全体の <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"前回のフル充電以降の内訳"</string>
@@ -2783,7 +2782,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"詳細設定"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"仕事用プロファイルの通知"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"アイコンバッジの許可"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"点滅"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ロック画面の通知"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"すべての通知内容を表示する"</string>
@@ -2858,14 +2858,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 件のカテゴリを削除しました</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 件のカテゴリを削除しました</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"通知バッジ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ON"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"OFF"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"すべてブロック"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"今後はこの通知を表示しない"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"通知の表示"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"シェードにも周辺端末にも通知を表示しない"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"アイコンバッジの許可"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"マナーモードをオーバーライドする"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"[マナーモード] が [優先する通知のみ] に設定されているとき、この通知を引き続き表示する"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ロック画面"</string>
@@ -3098,8 +3100,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g>（<xliff:g id="COUNT">%2$d</xliff:g>）"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"電池の最適化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"使用状況に関する通知"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"すべてのアプリを表示"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"余分なアプリを非表示"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"フル充電以降の端末の電池使用状況を表示"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"アプリの使用状況を表示"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"最適化していないアプリ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"最適化していないアプリ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"電池の使用を最適化"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 705abce..f7ea697 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს ესაჭიროება:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"აპის მიერ ნებართვის მოთხოვნის დაფარვის გამო, ვერ ხერხდება თქვენი პასუხის დადასტურება პარამეტრებით."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"პარამეტრები თქვენს მოქმედებაზე ვერ რეაგირებს, რადგან სხვა აპი გადაფარვითაა ნაჩვენები ამ ვარიანტებზე."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს თუ ჩართავთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ვინაიდან ხელმისაწვდომობის სერვისი ჩართეთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ ნიმუში."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>-ის წინ"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"აპების მიერ მოხმარება ბოლო დატენვიდან (<xliff:g id="TIME">^1</xliff:g>-ის წინ)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"მოწყობილობის მოხმარება ბოლო დატენვიდან (<xliff:g id="TIME">^1</xliff:g>-ის წინ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"დროის ხანგრძლივობა სრული დატენვიდან, რომლის განმავლობაშიც ეკრანი ჩართული იყო"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"მოწყობილობის მოხმარება ბოლო სრული დატენვიდან"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ბატარეის ხარჯი დამტენის გამოერთების შემდეგ"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"გამოიყენება <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"ეკრანის მოხმარება: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>-ს იყენებს <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ბატარეის საერთო მოხმარების <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"დეტალები ბოლო სრული დატენვიდან"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"შეტყობინებები"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"გაფართოებული"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"სამსახურის შეტყობინებები"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"ხატულას ბეჯების დაშვება"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"სინათლის ციმციმი"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ჩაკეტილ ეკრანზე"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"შეტყობინების მთელი შინაარსის ჩვენება"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> კატეგორია წაიშალა</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> კატეგორია წაიშალა</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"შეტყობინებების ბეჯები"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ჩართული"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"გამორთული"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ყველას დაბლოკვა"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ამ შეტყობინებების ჩვენების შეწყვეტა"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"შეტყობინებების ჩვენება"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"შეტყობინებების ჩრდილოვნად ან პერიფერიულ მოწყობილობებზე ჩვენების აღკვეთა"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"ხატულას ბეჯის დაშვება"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"„არ შემაწუხოთ“-ის უგულებელყოფა"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ამ შეტყობინებების ჩვენება მაშინაც კი, როცა რეჟიმისთვის „არ შემაწუხოთ“ არჩეულია „მხოლოდ პრიორიტეტული“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ჩაკეტილ ეკრანზე"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ბატარეის ოპტიმიზაცია"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"მოხმარების გაფრთხილებები"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"ყველა აპის ჩვენება"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"დამატებითი აპების დამალვა"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"მოწყობილობის მოხმარების სრულად ჩვენება"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"აპების მოხმარების ჩვენება"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"არ არის ოპტიმიზებული"</string>
     <string name="high_power_on" msgid="6216293998227583810">"არ არის ოპტიმიზებული"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ხდება ბატარეის გამოყენების ოპტიმიზაცია"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index acdc4b7..ff0d227 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> қолданылсын ба?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне қажет:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Бағдарлама рұқсат сұрауын жасырып тұрғандықтан, Параметрлер жауабыңызды тексере алмайды."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Себебі бұл опциялардың жоғарғы жағында басқа қолданба көрсетіледі. Параметрлер әрекетіңізге әсер етпейді."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> қоссаңыз, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Сіз арнайы мүмкіндіктер қызметін қосқандықтан, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, өрнекті растау керек."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> бұрын"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Толық зарядтан кейін (<xliff:g id="TIME">^1</xliff:g> бұрын) қолданба тұтынуы"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Толық зарядтан кейін құрылғы тұтынуы (<xliff:g id="TIME">^1</xliff:g> бұрын)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Толық зарядталғаннан кейін экран қосулы болған уақыт мөлшері"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Толық зарядталғаннан кейін құрылғының пайдаланылуы"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ажыратылғаннан бері батарея қолданысы"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Мөлшерінен жоғары есептелген қуатты қолдану"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> Ампер/сағ"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Экранның тұтынуы: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-н пайдаланды"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Жалпы батарея зарядының <xliff:g id="PERCENT">%1$s</xliff:g>-ы"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толық зарядталғаннан кейін пайдаланылғаны"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Хабарландырулар"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Кеңейтілген"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Жұмыс хабарландырулары"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Белгіше танымбелгілеріне рұқсат беру"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Жыпылықтаған жарық"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Құлып экранында"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүкіл хабарландыру мазмұнын көрсету"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> санат жойылды</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> санат жойылды</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Хабарландыру танымбелгілері"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Қосулы"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Өшірулі"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығына тыйым салу"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Бұл хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Хабарландыруларды көрсету"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Тақтада немесе перифериялық құрылғыларда хабарландыруларды ешқашан көрсетпеу"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Белгішеге рұқсат ету"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Мазаламау\" режимін қайта анықтау"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Мазаламау\" режимі \"Тек маңызды\" күйіне орнатылған кезде, осы хабарландыруларға рұқсат беру"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Құлып экранында"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Батареяны оңтайландыру"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Пайдаланушы ескертулері"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Барлығын көрсету"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Қосымша қолданбаларды жасыру"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Толық құрылғы тұтынуы"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Қолданбаны пайдалануды көрсету"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Оңтайландырылмаған"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Оңтайландырылмаған"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Батареяны пайдалануды оңтайландыру"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 3e1e46f..9f43eca 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ត្រូវ​ការ៖"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ដោយសារកម្មវិធីមួយកំពុងធ្វើឲ្យសំណើរអនុញ្ញាតមានភាពមិនច្បាស់ ការកំណត់នេះមិនអាចផ្ទៀងផ្ទាត់ការឆ្លើយតបរបស់អ្នកបានទេ។"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ការកំណត់មិនអាចឆ្លើយតបនឹងសកម្មភាពរបស់អ្នកបានទេ ដោយសារកម្មវិធីផ្សេងទៀតកំពុងបង្ហាញនៅលើជម្រើសទាំងនេះ។"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"បើ​អ្នក​បើក <xliff:g id="SERVICE">%1$s</xliff:g>, ឧបករណ៍របស់​អ្នកនឹង​មិន​ប្រើ​អេក្រង់​ជាប់សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ​ទេ។"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ព្រោះ​អ្នក​​បាន​បើក​សេវាកម្ម​ភាព​ងាយស្រួល ឧបករណ៍របស់​អ្នក​នឹង​មិន​ប្រើ​អេក្រង់​ជាប់​សោ​របស់​អ្នក​ដើម្បី​បង្កើន​ការ​អ៊ិនគ្រីប​ទិន្នន័យ។"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ព្រោះ​បើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់​ដល់​ការ​អ៊ិនគ្រីប​ទិន្នន័យ អ្នក​ត្រូវតែ​បញ្ជាក់​​លំនាំ​​របស់​អ្នក។"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេន​បណ្ដាញ​ទូរសព្ទ​ចល័ត"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> មុន"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"ការប្រើប្រាស់​កម្មវិធី​គិតចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="TIME">^1</xliff:g> មុន)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ការប្រើប្រាស់​ឧបករណ៍​គិតចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="TIME">^1</xliff:g> មុន)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"អេក្រង់រយៈពេលបាន​បើក​ចាប់តាំងពីសាកថ្មពេញ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ការប្រើប្រាស់ឧបករណ៍​ចាប់តាំងពី​សាកថ្មពេញ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ថ្ម​ដែល​បាន​ប្រើ​តាំង​ពី​លែង​បញ្ចូល"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"បានប្រើ​អស់​រយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"ការប្រើប្រាស់អេក្រង់មានរយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ប្រើប្រាស់ដោយ <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> នៃ​ថ្ម​ទាំងអស់"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ព័ត៌មានលម្អិតចាប់​តាំងពី​សាកថ្ម​ពេញ​លើកចុងក្រោយ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ការ​ជូនដំណឹង"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"កម្រិតខ្ពស់"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ការជូនដំណឹងពីកន្លែងធ្វើការ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"អនុញ្ញាតស្លាកសញ្ញាជារូបតំណាង"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ភ្លើងលោត"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"នៅលើអេក្រង់ជាប់សោ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​ខ្លឹមសារនៃការ​ជូនដំណឹង​ទាំងអស់"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">បានលុបប្រភេទចំនួន <xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="one">បានលុបប្រភេទចំនួន <xliff:g id="COUNT_0">%d</xliff:g></item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"គ្រឿងសម្គាល់ការជូនដំណឹង"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"បើក"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"បិទ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"រារាំងទាំងអស់"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​ទាំង​នេះ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"បង្ហាញ​ការ​ជូន​ដំណឹង"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"កុំ​បង្ហាញ​ការ​ជូន​ដំណឹង​នៅក្នុង​ផ្ទាំង​ទម្លាក់ ឬ​នៅលើ​ឧបករណ៍​ភ្ជាប់​ជាមួយ​កុំព្យូទ័រ"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"អនុញ្ញាតស្លាកសញ្ញាជារូបតំណាង"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"បដិសេធរបៀបកុំរំខាន"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"អនុញ្ញាតឲ្យការជូនដំណឹងទាំងនេះបន្តរំខាន នៅពេលដែលរបៀបកុំរំខានត្រូវបានកំណត់ទៅ របៀបអាទិភាពប៉ុណ្ណោះ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"នៅលើអេក្រង់ជាប់សោ"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ការបង្កើនប្រសិទ្ធភាពថ្ម"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ការ​ដាស់តឿន​លើ​ការ​ប្រើប្រាស់"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"បង្ហាញ​​កម្មវិធី​ទាំងអស់"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"លាក់កម្មវិធី​បន្ថែម​ទៀត"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"បង្ហាញការប្រើប្រាស់ឧបករណ៍ពេញលេញ"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"បង្ហាញការប្រើប្រាស់កម្មវិធី"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"មិនបានបង្កើនប្រសិទ្ធភាព"</string>
     <string name="high_power_on" msgid="6216293998227583810">"មិនបានសម្រួលឲ្យមានប្រសិទ្ធភាពទេ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"បង្កើនប្រសិទ្ធភាពប្រើប្រាស់ថ្ម"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ec435b2..120d6ff 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ಬಳಸುವುದೇ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ಈ ಕೆಳಗಿನವುಗಳನ್ನು ಮಾಡುತ್ತದೆ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ಅನುಮತಿ ವಿನಂತಿಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಮರೆಮಾಚುತ್ತಿರುವ ಕಾರಣ, ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ಈ ಆಯ್ಕೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಇನ್ನೊಂದು ಅಪ್ಲಿಕೇಶನ್ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತಿರುವುದರಿಂದ, ಸೆಟ್ಟಿಂಗ್‌ಗಳು ನಿಮ್ಮ ಕ್ರಿಯೆಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ಅನ್ನು ನೀವು ಆನ್‌ ಮಾಡಿದರೆ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ನೀವು ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಯನ್ನು ಆನ್‌ ಮಾಡಿರುವುದರರಿಂದ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್‌ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್‌ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ (<xliff:g id="TIME">^1</xliff:g> ಹಿಂದೆ)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ (<xliff:g id="TIME">^1</xliff:g> ಹಿಂದೆ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಪರದೆ ಆನ್ ಆಗಿದ್ದ ಅವಧಿ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ಅನ್‌ಪ್ಲಗ್‌ ಆದಾಗಿನಿಂದ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"ಸ್ಕ್ರೀನ್ ಬಳಕೆ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ಬಳಸುತ್ತಿರುವುದು <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ಒಟ್ಟು ಬ್ಯಾಟರಿಯ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ಕೊನೆಯ ಬಾರಿ ಚಾರ್ಜ್‌ ಆದ ನಂತರದ ಬಳಕೆಯ ವಿವರ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"ಸುಧಾರಿತ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"ಐಕಾನ್ ಬ್ಯಾಡ್ಜ್‌ಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ಮಿನುಗುವ ಬೆಳಕು"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ಅಧಿಸೂಚನೆ ವಿಷಯವನ್ನು ಪೂರ್ತಿ ತೋರಿಸು"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಗಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಗಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"ಅಧಿಸೂಚನೆ ಬ್ಯಾಡ್ಜ್‌ಗಳು"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ಆನ್"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ಆಫ್"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ಎಲ್ಲವನ್ನೂ ನಿರ್ಬಂಧಿಸು"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಎಂದಿಗೂ ತೋರಿಸಬೇಡ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ಶೇಡ್ ಅಥವಾ ಪೆರಿಪೆರಲ್ ಸಾಧನಗಳಲ್ಲಿ ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"ಐಕಾನ್ ಬ್ಯಾಡ್ಜ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅತಿಕ್ರಮಿಸು"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅನ್ನು ಆದ್ಯತೆಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಅಡ್ಡಿಪಡಿಸಲು ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮುಂದುವರಿಸಲು ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್‌"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ಬಳಕೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರದರ್ಶಿಸಿ"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"ಹೆಚ್ಚುವರಿ ಅಪ್ಲಿಕೇಶನ್‌ ಮರೆಮಾಡಿ"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ಸಾಧನದ ಸಂಪೂರ್ಣ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e68ebfc..9bfb632 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"권한 요청을 보이지 않게 하는 앱이 있어서 설정에서 내 응답을 확인할 수 없습니다."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"다른 앱이 이 옵션 위에 표시되므로 설정에서 내 작업에 응답할 수 없습니다."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"접근성 서비스를 사용 설정했으므로 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 패턴 확인이 필요합니다."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> 전"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"충전 완료(<xliff:g id="TIME">^1</xliff:g> 전) 후 앱 사용"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"충전 완료 후 기기 사용(<xliff:g id="TIME">^1</xliff:g> 전)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"충전 완료 후 화면이 켜진 시간"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"충전 완료 후 기기 사용"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> 사용됨"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"화면 사용 시간: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$s</xliff:g> 사용"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"전체 배터리 사용량의 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"마지막 충전 완료 후 사용 내역 분석"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"알림"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"고급"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"직장 알림"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"아이콘 배지 허용"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"표시등이 깜박거림"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"잠금 화면에서"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">카테고리 <xliff:g id="COUNT_1">%d</xliff:g>개 삭제됨</item>
       <item quantity="one">카테고리 <xliff:g id="COUNT_0">%d</xliff:g>개 삭제됨</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"알림 배지"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"사용"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"사용 안함"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"이러한 알림을 다시 표시하지 않음"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"알림 표시"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"알림을 창이나 주변기기에 표시하지 않음"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"아이콘 배지 허용"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"알림 일시중지 무시"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"알림 일시중지가 중요 알림만으로 설정된 경우 이러한 알림을 계속 받도록 허용"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"잠금 화면에서"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g>(<xliff:g id="COUNT">%2$d</xliff:g>개)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"배터리 최적화"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"배터리 사용량 알림"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"모든 앱 표시"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"추가 앱 숨기기"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"전체 기기 사용 정보 표시"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"앱 사용 정보 표시"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"최적화되지 않음"</string>
     <string name="high_power_on" msgid="6216293998227583810">"최적화되지 않음"</string>
     <string name="high_power_off" msgid="3393904131961263278">"배터리 최적화 사용"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index b740e8f..83f4382 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1853,7 +1853,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> колдоносузбу?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Колдонмо уруксат суроо-талабын түшүнбөй жаткандыктан, Жөндөөлөр жообуңузду текшере албайт."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Бул опциялардын үстүндө башка колдонмо көрсөтүлүп жаткандыктан, Жөндөөлөр сиздин аракетиңизге жооп бере албайт."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Эгер <xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлсө, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Атайын мүмкүнчүлүктөр кызматы күйгүзүлгөндүктөн, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, үлгүңүздү ырасташыңыз керек."</string>
@@ -1913,6 +1912,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> мурун"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Толук кубаттлг бери иштегн колднмлр (<xliff:g id="TIME">^1</xliff:g> мурун)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Толук кубатталгандан бери түзмөктүн колдонулушу (<xliff:g id="TIME">^1</xliff:g> мурун)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Толук кубатталгандан бери экрандын күйүп турган убактысы"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Толук кубатталгандан бери түзмөктүн колдонулушу"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Суурулгандан бери батареянын колдонулушу"</string>
@@ -2004,8 +2004,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ашыкча эсептелген кубаттын пайдаланылышы"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> бою колдонулду"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Экрандын колдонулушу - <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> колдонмосу <xliff:g id="PERCENT">%1$s</xliff:g> сарптады"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Батарея кубатынын <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толук кубатталгандан бери канчасы колдонулду:"</string>
@@ -2782,7 +2781,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Эскертмелер"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Өркүндөтүлгөн"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Жумуш боюнча эскертмелер"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Бейджиктин сүрөтчөлөрүн көрсөтүүгө уруксат берүү"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Жарык индикатору"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Кулпуланган экранда"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Эскертме толугу менен көрүнсүн"</string>
@@ -2857,14 +2857,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категория жок кылынды</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категория жок кылынды</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Эскертме бейджиктери"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Күйүк"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Өчүк"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Бул эскертмелер эч качан көрсөтүлбөсүн"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Эскертмелерди көрсөтүү"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Эскертмелер эч качан көлөкөдө же сырткы түзмөктөрдө көрсөтүлбөсүн"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Бейджиктин сүрөтчөсүн көрсөтүүгө уруксат берүү"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Тынчымды албаны өзгөртүп коюу"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Тынчымды алба режиминде\" \"Шашылыш эскертмелер гана\" деп белгиленсе ушул эскертмелер көрүнөт"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Кулпуланган экранда"</string>
@@ -3097,8 +3099,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Батареяны үнөмдөө"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Батареянын сарпталышы"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Бардык колдонмолорду көрсөтүү"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Кошумча колдонмолорду жашыруу"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Түзмөктүн колдонулушун толук көрсөтүү"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Колдонмонун иштетилиши"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Батареяны үнөмдөшпөйт"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Батарянын кубатын үнөмдөшпөйт"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Батареянын кубатын үнөмдөө иштетилген"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 8161876..1701144 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ຕ້ອງການ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ເພາະ​ວ່າ​ແອັບຯ​ກຳ​ລັງ​ຂັດ​ຂວາງ​ການ​ຂໍ​ອະ​ນຸ​ຍາດ, ການ​ຕັ້ງ​ຄ່າ​ບໍ່​ສາ​ມາດກວດ​ສອບ​ການ​ຕອບ​ຮັບ​ຂອງ​ທ່ານ​ໄດ້."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ເນື່ອງຈາກແອັບອື່ນກຳລັງສະແດງຜົນບັງຕົວເລືອກເຫຼົ່ານີ້, ການຕັ້ງຄ່າຈຶ່ງບໍ່ສາມາດຕອບສະໜອງຄຳສັ່ງຂອງທ່ານໄດ້."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ຫາກ​ທ່ານ​ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>, ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"​ເນື່ອງ​ຈາກ​ທ່ານ​ໄດ້​ເປີດ​ບໍ​ລິ​ການ​ການ​ຊ່ວຍ​ການ​ເຂົ້າ​ເຖິງ, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ບໍ່​ໃຊ້​ການ​ລັອກ​ໜ້າ​ຈໍ​ຂອງ​ທ່ານ​ເພື່ອ​ເພີ່ມ​ການ​ເຂົ້າ​ລະ​ຫັດ​ຂໍ້​ມູນ."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ເພາະ​ວ່າ​ການ​ເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ມີ​ຜົນ​ຕໍ່​ການ​ເຂົ້າ​ລະ​ຫັດ, ​ທ່ານ​ຈຶ່ງ​ຈຳ​ຕ້ອງ​ຢືນ​ຢັນ​ຮູບ​ແບບ​ການ​ລັອກ​ຂອງ​ທ່ານ."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ກ່ອນ"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"ການນຳໃຊ້ແອັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="TIME">^1</xliff:g> ກ່ອນ)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ການນຳໃຊ້ອຸປະກອນຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="TIME">^1</xliff:g> ກ່ອນ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ໄລຍະເວລາທີ່ໜ້າຈໍເປີດຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ການນຳໃຊ້ອຸປະກອນຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ໃຊ້ເປັນເວລາ <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"ການນຳໃຊ້ໜ້າຈໍ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ໃຊ້ໄປແລ້ວໂດຍ <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ຂອງແບັດເຕີຣີໂດຍຮວມ"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ວິເຄາະນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ການແຈ້ງເຕືອນ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"​ຂັ້ນ​ສູງ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ການແຈ້ງເຕືອນວຽກ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"ອະນຸຍາດປ້າຍໄອຄອນ"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ກະພິບໄຟ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ຢູ່ໜ້າຈໍລັອກ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ສະແດງ​ເນື້ອຫາ​ການແຈ້ງເຕືອນ​ທັງໝົດ"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">ລຶບ <xliff:g id="COUNT_1">%d</xliff:g> ໝວດໝູ່ອອກແລ້ວ</item>
       <item quantity="one">ລຶບ <xliff:g id="COUNT_0">%d</xliff:g> ໝວດໝູ່ອອກແລ້ວ</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"ປ້າຍການແຈ້ງເຕືອນ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ເປີດ"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ປິດ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ບ​ລັອກ​ທັງ​ໝົດ"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ຢ່າສະແດງການແຈ້ງເຕືອນເຫຼົ່ານີ້ອີກ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ສະແດງການແຈ້ງເຕືອນ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ຢ່າສະແດງການແຈ້ງເຕືອນໃນເງົາ ຫຼື ອຸປະກອນຕໍ່ພ່ວງອີກ."</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"ອະນຸຍາດປ້າຍໄອຄອນ"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ຍົກເລີກຫ້າມລົບກວນ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ອະນຸຍາດ​ໃຫ້ການ​ແຈ້ງ​ເຕືອນ​​ເຫຼົ່າ​ນີ້​ສືບ​ຕໍ່​ຂັດ​ຈັງຫວະ ​ເມື່ອຄຸນສົມບັດ ຫ້າມ​ລົບ​ກວນ ຖືກ​ຕັ້ງ​ເປັນແບບບຸລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ຢູ່ໜ້າຈໍລັອກ"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ການປັບແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ການແຈ້ງເຕືອນການນຳໃຊ້"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"ສະແດງແອັບທັງໝົດ"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"ເຊື່ອງແອັບເພີ່ມເຕີມ"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ສະແດງການນຳໃຊ້ແອັບແບບເຕັມ"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ສະແດງການນຳໃຊ້ແອັບ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ກຳລັງປັບການໃຊ້ແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 25fca4e..4ab9f0b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ reikia:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Kadangi programa užstoja leidimo užklausą, nustatymuose negalima patvirtinti jūsų atsakymo."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Kadangi kita programa rodoma virš šių parinkčių, nustatymai negali reaguoti į jūsų veiksmą."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jei įjungsite „<xliff:g id="SERVICE">%1$s</xliff:g>“, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kadangi įjungėte pritaikymo neįgaliesiems paslaugą, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti atrakinimo piešinį."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"prieš <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Programų naud. po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Įrenginio naudojimas po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Kiek laiko ekranas buvo įjungtas po visiško įkrovimo"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Įrenginio naudojimas po visiško įkrovimo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Naudojama <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrano naudojimas: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> naudoja „<xliff:g id="APP">%2$s</xliff:g>“"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> visos akumuliatoriaus įkrovos"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Naudojimo nuo paskutinio visiško įkrovimo analizė"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Pranešimai"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Išplėstiniai"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Darbo profilio pranešimai"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Leisti piktogramų ženklelius"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Mirksinti šviesa"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Užrakinimo ekrane"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rodyti visą pranešimo turinį"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="many">Ištrinta <xliff:g id="COUNT_1">%d</xliff:g> kategorijos</item>
       <item quantity="other">Ištrinta <xliff:g id="COUNT_1">%d</xliff:g> kategorijų</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Pranešimų ženkleliai"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Įjungta"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Išjungta"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Niekada nerodyti šių pranešimų"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Rodyti pranešimus"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Niekada nerodyti pranešimų skydelyje ar išoriniuose įrenginiuose"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Leisti piktogramos ženklelį"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nepaisyti netrukdymo režimo"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Leisti ir toliau teikti šiuos pranešimus, kai netrukdymo režimas nustatytas į „Tik prioritetiniai“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Užrakinimo ekrane"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akumuliatoriaus optimiz."</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Rodyti visas programas"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Slėpti papildomas programas"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo informaciją"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Rodyti progr. naud. inform."</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizuota"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimizuota"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizuojamas akumuliatoriaus naudojimas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ec10231..0c236b3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1874,7 +1874,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> nepieciešams:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Lietotne Iestatījumi nevar verificēt jūsu atbildi, jo cita lietotne aizsedz atļaujas pieprasījumu."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Lietotne Iestatījumi nevar atbildēt uz jūsu darbību, jo cita lietotne tiek rādīta virs šīm opcijām."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ja ieslēgsiet pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Tā kā esat ieslēdzis pieejamības pakalpojumu, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina sava grafiskā atslēga."</string>
@@ -1935,6 +1934,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Pirms <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Jaudas patēriņš lietotnēs kopš pilnas uzlādes (pirms <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ierīces lietojums kopš pilnas uzlādes (pirms šāda laika: <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Cik ilgi ekrāns ir ieslēgts kopš pilnas uzlādes"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ierīces lietojums kopš pilnas uzlādes"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
@@ -2026,8 +2026,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Izmantots šādu laiku: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrāna lietojums: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> izmanto lietotne <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> no vispārējā akumulatora lietojuma"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sadalījums kopš pēdējās pilnās uzlādes"</string>
@@ -2806,7 +2805,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Paziņojumi"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Papildu"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Darba paziņojumi"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Atļaut ikonu emblēmas"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Mirgojošs gaismas signāls"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Bloķēšanas ekrānā"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rādīt visu saturu paziņojumos"</string>
@@ -2884,14 +2884,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija dzēsta</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorijas dzēstas</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Paziņojumu emblēmas"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ieslēgti"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Izslēgti"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nekad nerādīt šos paziņojumus"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Rādīt paziņojumus"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nekad nerādīt paziņojumus panelī vai perifērijas ierīcēs"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Atļaut ikonas emblēmu"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorēt režīmu “Netraucēt”"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ļaut šiem paziņojumiem pārtraukt arī turpmāk, ja režīms “Netraucēt” ir iestatīts uz “Tikai prioritārie”"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Bloķēšanas ekrānā"</string>
@@ -3130,8 +3132,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akumulatora optimizācija"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Brīdinājumi par lietojumu"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Rādīt visas lietotnes"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Paslēpt papildu lietotnes"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Rādīt pilnu ierīces lietojumu"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Rādīt lietotnes izmantojumu"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Netiek optimizēts"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Netiek optimizēts"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akumulatora darbība tiek optimizēta"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 995f1ce..18d967f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Користи <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Бидејќи апликацијата го прикрива барањето за дозвола, Поставките не може да го потврдат вашиот одговор."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"„Поставки“ не може да реагира на вашето дејство, бидејќи друга апликација се прикажува врз опцииве."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако вклучите <xliff:g id="SERVICE">%1$s</xliff:g>, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Со оглед на тоа што вклучивте услуга на пристапност, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите шемата."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"пред <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Употреба на апликациите по целосно полнење (пред <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Употреба на уредот по целосно полнење (пред <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Време на активен екран по целосно полнење"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Употреба на уредот по целосно полнење"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батеријата од исклучување"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Надмината употреба на напојување"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Користење <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Користење на екранот <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> искористени од <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> од целокупната батерија"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Детали по последното целосно полнење"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Известувања"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Напредни"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Известувања за работен профил"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Дозволете значки на иконите"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Трепкај со сијаличката"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заклучениот екран"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи ја целата содржина од известувањето"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> категорија е избришана</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категории се избришани</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Значки за известувања"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Вклучени"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Исклучени"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај ги сите"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Никогаш не прикажувај ги известувањава"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Прикажувај известувања"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Никогаш не прикажувај известувања во сенка или на периферни уреди"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Дозволете значка на икона"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отфрли го Не вознемирувај"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Оставете ги известувањава да продолжат да прекинуваат кога опцијата Не вознемирувај е поставена на Само приоритетни"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заклучениот екран"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Оптимизација на батерија"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Предупредувања за батеријата"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Прикажи ги сите апликации"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Сокриј дополнителни апликации"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Прикажи ја употребата на целосно полниот уред"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи употреба на апликација"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не се оптимизирани"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не е оптимизирано"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Се оптимизира користењето на батеријата"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3f2f941..0e12e48 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് ഇവ ആവശ്യമാണ്:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"അനുമതി അഭ്യർത്ഥനയെ ഒരു അപ്ലിക്കേഷൻ മറയ്‌ക്കുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ പ്രതികരണം പരിശോധിച്ചുറപ്പിക്കാനാകില്ല."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ഈ ഓപ്‌ഷനുകളുടെ മുകളിൽ മറ്റൊരു ആപ്പ് ദൃശ്യമാകുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ നടപടിയോട് പ്രതികരിക്കാനാവില്ല."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കിയെങ്കിൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"നിങ്ങൾ ഉപയോഗസഹായി സേവനം ഓണാക്കിയതിനാൽ, ഡാറ്റ എൻക്രിപ്‌ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്‌ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്‌ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യൽ"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> മുമ്പ്"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"ഫുൾ ചാർജുചെയ്തശേഷമുള്ള ആപ്പ് ഉപയോഗം (<xliff:g id="TIME">^1</xliff:g> മുമ്പ്)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"പൂർണ്ണമായി ചാർജുചെയ്‌തതിന് ശേഷമുള്ള ഉപകരണ ഉപയോഗം (<xliff:g id="TIME">^1</xliff:g> മുമ്പ്)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തത് മുതൽ സ്‌ക്രീൻ ഓണായിരുന്ന സമയം"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള ഉപകരണ ഉപയോഗം"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്‌തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> സമയം ഉപയോഗിച്ചു"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"സ്‌ക്രീൻ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ആപ്പ് <xliff:g id="PERCENT">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"മൊത്തം ബാറ്ററിയുടെ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ഫുൾ ചാർജിനുശേഷമുള്ള ഉപയോഗ വിശദാംശങ്ങൾ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"അറിയിപ്പുകൾ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"വിപുലമായത്"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ഔദ്യോഗിക അറിയിപ്പുകൾ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"ഐക്കൺ ബാഡ്‌ജുകൾ അനുവദിക്കുക"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ലൈറ്റ് മിന്നുക"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ലോക്ക് സ്ക്രീനിൽ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"എല്ലാ അറിയിപ്പുകളും കാണിക്കുക"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> വിഭാഗങ്ങൾ ഇല്ലാതാക്കി</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> വിഭാഗം ഇല്ലാതാക്കി</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"അറിയിപ്പ് ബാഡ്‌ജുകൾ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ഓൺ"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ഓഫ്"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ഈ അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"അറിയിപ്പുകൾ കാണിക്കുക"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ഷെയ്‌ഡിലോ പെരിഫെറൽ ഉപകരണങ്ങളിലോ ഒരിക്കലും അറിയിപ്പുകൾ കാണിക്കരുത്"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"ഐക്കൺ ബാഡ്‌ജ് അനുവദിക്കുക"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ശല്യപ്പെടുത്തരുത്\' അസാധുവാക്കുക"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\'മുൻഗണനയുള്ളവ മാത്രം\' എന്നതിലേക്ക് \'ശല്യപ്പെടുത്തരുത്\' സജ്ജമാക്കിയിട്ടുള്ളപ്പോൾ തടസ്സപ്പെടുത്തുന്നത് തുടരാൻ ഈ അറിയിപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ലോക്ക് സ്ക്രീനിൽ"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ബാറ്ററി ഓപ്റ്റിമൈസേഷൻ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ബാറ്ററി ഉപഭോഗ മുന്നറിയിപ്പ്"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"എല്ലാ ആപ്പുകളും കാണിക്കൂ"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"അധികമുള്ള ആപ്പുകൾ ‌മറയ്ക്കുക"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ഉപകരണത്തിന്റെ മുഴുവൻ ഉപയോഗം കാണിക്കുക"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ആപ്പ് ഉപയോഗം കാണിക്കുക"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ബാറ്ററി ഉപയോഗം ഓപ്റ്റിമൈസ് ചെയ്യുന്നു"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index c832627..98d52ea 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> шаардлага:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Апп нь зөвшөөрөл авах хүсэлтийг танихгүй байгаа тул Тохиргооноос таны хариултыг баталгаажуулж чадахгүй байна."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Өөр апп эдгээр сонголтын дээр гарч ирж байгаа тул таны тохиргоог хийх боломжгүй байна."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Хэрэв та <xliff:g id="SERVICE">%1$s</xliff:g>-г асаавал таны төхөөрөмж дата шифрлэлтийг сайжруулах дэлгэцийн түгжээг ашиглахгүй."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Та хандалтын үйлчилгээг асаасан учир таны төхөөрөмж таны дэлгэцийн түгжээг дата шифрлэлтэнд ашиглахгүй."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та хээгээ баталгаажуулах шаардлагатай."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>-н өмнө"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Бүрэн цэнэглэснээс хойших апп ашиглалт (<xliff:g id="TIME">^1</xliff:g>-н өмнө)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Бүрэн цэнэглэснээс хойших төхөөрөмж ашиглалт (<xliff:g id="TIME">^1</xliff:g>-н өмнө)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Бүрэн цэнэглэснээс хойших дэлгэцийг асаалттай байлгасан хугацаа"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Бүрэн цэнэглэснээс хойших төхөөрөмжийн ашиглалт"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Салгаснаас хойшхи зайны ашиглалт"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>-д ашигласан"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Дэлгэц ашиглалт <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-г ашигласан"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Бүх батерейны <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтын мэдээлэл"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Мэдэгдэл"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Нарийвчилсан"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ажлын мэдэгдэл"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Дүрс тэмдгийг зөвшөөрөх"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Анивчих гэрэл"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Түгжигдсэн дэлгэц дээр"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
@@ -2852,14 +2852,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категорийг устгасан</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категорийг устгасан</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Мэдэгдлийн тэмдэг"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Идэвхтэй"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Идэвхгүй"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Бүгдийг блокло"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Эдгээр мэдэгдлийг хэзээ ч харуулахгүй"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Мэдэгдэл харуулах"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Мэдэгдлийг сүүдэрт, эсвэл захын төхөөрөмжид хэзээ ч харуулахгүй"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Дүрс тэмдгийг зөвшөөрөх"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Бүү саад бол\"-г дарах"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Бүү саад бол\" горимыг \"Зөвхөн Тэргүүлэх ач холбогдолтой\" болгон тохируулсан үед эдгээр мэдэгдэл үргэлжлэн саад болохыг зөвшөөрнө үү."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Түгжигдсэн дэлгэц дээр"</string>
@@ -3092,8 +3094,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Тэжээлийн оновчлол"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Хэрэглээний сануулга"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Бүх аппыг харуулах"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Нэмэлт аппыг нуух"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Төхөөрөмжийн бүрэн ашиглалтыг харуулах"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Апп ашиглалтыг харуулах"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Оновчлоогүй"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Оновчлоогүй"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Тэжээлийн хэрэглээг оновчилж байна"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 29f0fa1..0253537 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायचे?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपला प्रतिसाद सत्यापित करू शकत नाहीत."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"या पर्यायांच्‍यावर दुसरे अॅप प्रदर्शित होत असल्याने, सेटिंग्ज आपल्या क्रियेला प्रतिसाद देऊ शकत नाहीत."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"आपण <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, आपले डिव्‍हाइस डेटा कूटबद्धीकरण वर्धित करण्‍यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"आपण प्रवेशयोग्यता सेवा चालू केली असल्‍यामुळे, आपले डिव्‍हाइस डेटा कूटबद्धीकरण वर्धित करण्‍यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या नमुन्याची पुष्टी करण्याची आवश्यकता आहे."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पूर्वी"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज झाल्यापासून अॅप वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"पूर्ण चार्ज झाल्यापासूनचा डिव्हाइस वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्जपासून स्क्रीन चालू असण्याच्या वेळाचे प्रमाण"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डिव्हाइस वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात पॉवर वापर"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>साठी वापरले"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रीनचा वापर <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> वापरले"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"एकूण बॅटरीचे <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"मागच्या वेळेस पूर्ण चार्ज झाल्यापासूनचा ब्रेकडाउन"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"सूचना"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"प्रगत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्य सूचना"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"चिन्‍ह बॅजना अनुमती द्या"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"लुकलुकता प्रकाश"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीनवर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सर्व सूचना सामग्री दर्शवा"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणी हटवली</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> श्रेण्या हटवल्या</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"सूचना बॅज"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"चालू"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"बंद"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सर्व अवरोधित करा"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"या सूचना कधीही दर्शवू नका"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"सूचना दर्शवा"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कधीही रंगछटांंमध्ये किंवा डिव्हाइसच्या किनारीवर दर्शवू नका"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"चिन्ह बॅजला अनुमती द्या"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"व्यत्यय आणू नका अधिशून्य करा"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्‍हा या सूचनांना व्यत्यय आणणे सुरु ठेवू द्या"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीनवर"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"बॅटरी ऑप्टिमायझेशन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"वापरासंबंधी सूचना"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"सर्व अॅप्स दर्शवा"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अॅप्स लपवा"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"पूर्ण डिव्हाइस वापर दाखवा"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"अॅपचा वापर दाखवा"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करीत आहे"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8424edd..c78726b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Oleh sebab apl melindungi permintaan kebenaran, Tetapan tidak dapat mengesahkan jawapan anda."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Tetapan tidak dapat bertindak balas terhadap tindakan anda kerana apl lain sedang dipaparkan di atas pilihan ini."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika anda menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g>, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Oleh sebab anda telah menghidupkan perkhidmatan kebolehaksesan, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan corak anda."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan apl sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Penggunaan peranti sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah masa skrin dihidupkan sejak cas penuh"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan peranti sejak cas penuh"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Penggunaan skrin <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> daripada keseluruhan bateri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pecahan sejak cas penuh terakhir"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Pemberitahuan"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Terperinci"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pemberitahuan kerja"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Benarkan lencana ikon"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Lampu berkelip"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pada skrin kunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tunjukkan semua kandungan pemberitahuan"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori dipadamkan</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori dipadamkan</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Lencana pemberitahuan"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Hidup"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Mati"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Jangan sekali-kali tunjukkan pemberitahuan ini"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Tunjukkan pemberitahuan"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan sekali-kali tunjukkan pemberitahuan dalam bidai atau pada peranti persisian"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Benarkan lencana ikon"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Atasi Jangan Ganggu"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Benarkan pemberitahuan ini terus mengganggu apabila tetapan Jangan Ganggu ditetapkan kepada Keutamaan Sahaja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pada skrin kunci"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Pengoptimuman bateri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Makluman penggunaan"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Tunjukkan semua apl"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan apl tambahan"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Tunjukkan penggunaan peranti penuh"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Tunjukkan penggunaan apl"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimumkan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimumkan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Mengoptimumkan penggunaan bateri"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9ad76ee..98a632b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ကို သုံးမလား။"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ကလုပ်ဆောင်ရန်များ-"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"အပလီကေးရှင်းသည် ခွင့်ပြုချက်တောင်းခံမှုကို ပိတ်လိုက်ခြင်းကြောင့်၊ သင့်တုန့်ပြန်မှုကို အချိန်ညှိချက်များ အတည်မပြုနိုင်ပါ။"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"အခြားအက်ပ်တစ်ခုက ဤအကြောင်းအရာများထိပ်မှာ ပေါ်နေသောကြောင့် ဆက်တင်များက သင်၏ လုပ်ဆောင်ကို တုံ့ပြန်နိုင်ခြင်းမရှိပါ။"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် ရေးဆွဲပုံစံဖြင့် အတည်ပြုရန် လိုသည်။"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"မိုဘိုင်းကွန်ရက် ရှာဖွေခြင်း"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"အားဖြည့်ပြီးချိန်မှစ၍ (ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"အားအပြည့် သွင်းပြီးချိန်မှစ၍ အက်ပ်အသုံးပြုမှု (ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"အားအပြည့်သွင်းပြီးသည့် အချိန်မှစ၍ မျက်နှာပြင်ကို ဖွင့်ထားသောအချိန်"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"အားအပြည့်သွင်းထားသည့် အချိန်မှစ၍ စက်ပစ္စည်း အသုံးပြုမှု"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"အားသွင်းကြိုးဖြုတ်စဉ်မှဘတ္တရီအသုံးပြုနှုန်း"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ကြာ သုံးထားသည်"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"မျက်နှာပြင်အသုံးပြုချိန် <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ကို <xliff:g id="APP">%2$s</xliff:g> က အသုံးပြုထားသည်"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"စုစုပေါင်း ဘက်ထရီ၏<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"နောက်ဆုံးအကြိမ် အားဖြည့်ပြီးချိန်မှစ၍ ခွဲခြမ်းစိတ်ဖြာချက်"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"အကြောင်းကြားချက်များ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"အဆင့်မြင့်"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"အလုပ်သတိပေးချက်များ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"သင်္ကေတတံဆိပ်များကို ခွင့်ပြုရန်"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြမည်"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">အုပ်စု <xliff:g id="COUNT_1">%d</xliff:g> ခုကို ဖျက်လိုက်ပါပြီ</item>
       <item quantity="one">အုပ်စု <xliff:g id="COUNT_0">%d</xliff:g> ခုကို ဖျက်လိုက်ပါပြီ</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"အကြောင်းကြားချက် တံဆိပ်များ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ဖွင့်ထားသည်"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ပိတ်ထားသည်"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"အားလုံးကို ပိတ်ဆို့ရန်။"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ဤအကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"အကြောင်းကြားချက်များ ပြပါ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"အရိပ်ထဲ သို့မဟုတ် တွဲချိတ်ထားသည့် စက်ပစ္စည်းများပေါ်တွင် အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"သင်္ကေတတံဆိပ်ကို ခွင့်ပြုရန်"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"မနှောင်ယှက်ပါနှင့် ကို အပေါ်မှဖျက်ရေးပါ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"မနှောင်ယှက်ပါနှင့် ကို ဦးစားပေးမှု အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ဤသတိပေးချက်များအား ဆက်လက်ပြီး စွက်ဖက်ခွင့် ပြုပါ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> ( <xliff:g id="COUNT">%2$d</xliff:g> )"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ဘက်ထရီအသုံးမြှင့်ခြင်း"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"သုံးစွဲမှုသတိပေးချက်များ"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"အက်ပ်အားလုံးပြရန်"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"အပိုအက်ပ်များကို ဝှက်ရန်"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"စက်ပစ္စည်း အသုံးပြုမှု အပြည့်အစုံကို ပြရန်"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"အက်ပ်အသုံးပြုမှုကို ပြရန်"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"မလုပ်ရသေးပါ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"သင့်မြတ်အောင် မလုပ်ရသေး"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ဘက်ထရီ အသုံးပြုမှု သင့်မြတ်အောင် လုပ်နေ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8c33793..d2d0da3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> må"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Fordi en app skjuler tillatelsesforespørselen, kan ikke Innstillinger bekrefte svaret ditt."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Fordi en annen app vises oppå disse alternativene, kan ikke Innstillinger svare på handlingen din."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du slår på <xliff:g id="SERVICE">%1$s</xliff:g>, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Fordi du har slått på en tilgjengelighetstjeneste, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Du må bekrefte mønsteret ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"for <xliff:g id="TIME">^1</xliff:g> siden"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Appbruk siden batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Bruk av enheten siden sist batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lenge skjermen har vært på siden batteriet var fulladet"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsbruk siden batteriet var fulladet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Brukt i <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Skjermbruk <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> brukt av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av total batteribruk"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Oversikt siden sist batteriet var fulladet"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Varsler"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avansert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Jobbvarsler"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Tillat ikonmerker"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskjermen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varsler"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier er slettet</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori er slettet</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Varselmerker"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"På"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Av"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Vis aldri disse varslene"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Vis varsler"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Vis aldri varlser i panelet eller på eksterne enheter"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Tillat ikonmerke"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Overstyr Ikke forstyrr"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"La disse varslene fortsette å forstyrre når Ikke forstyrr er angitt til Bare prioriterte"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskjermen"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batterioptimalisering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Bruksvarsler"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Vis alle apper"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Skjul ekstra apper"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Vis fullstendig enhetsbruk"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appbruk"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ikke optimalisert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ikke optimalisert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliserer batteribruken"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 8dc4b10..cd11544 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> प्रयोग गर्नुहुन्छ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई आवश्यक:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"एपले अनुमति अनुरोधलाई अस्पष्ट मानिरहेको हुनाले, सेटिङहरूलले तपाईंको प्रतिक्रियालाई प्रमाणित गर्न सक्दैनन्।"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"यी विकल्पहरूको शीर्ष भागमा अर्को अनुप्रयोग देखिइरहेको हुनाले सेटिङहरूले तपाईंको कारबाहीको प्रतिक्रिया दिन सक्दैनन्।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि तपाईंले <xliff:g id="SERVICE">%1$s</xliff:g> खोल्नुभयो भने, आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन।"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन, किनभने तपाईंले पहुँच सेवा खोल्नुभएको छ।"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईंले आफ्नो प्याटर्न पुष्टि गर्न आवश्यक छ।"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पहिले"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज भएदेखि अनुप्रयोगको प्रयोग (<xliff:g id="TIME">^1</xliff:g> पहिले)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग (<xliff:g id="TIME">^1</xliff:g> पहिले)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्ज भएदेखि स्क्रिन सक्रिय रहेको समय"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग भएदेखि ब्याट्री प्रयोग"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> का लागि प्रयोग गरियो"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रिन प्रयोग गरेको समय <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ले प्रयोग गरेको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"समग्र ब्याट्रीको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पछिल्लो पटक पूर्ण चार्ज भएदेखिको विश्लेषण"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"सूचनाहरू"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"उन्‍नत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्यका सूचनाहरू"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"आइकनका ब्याजहरूलाई अनुमति दिनुहोस्"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"झिम झिम गर्ने बत्ती"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लक स्क्रिनमा"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सबै सूचना सामग्री देखाउनुहोस्"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मेटाइएका कोटिहरू</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मेटाइएको कोटि</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"सूचनाका पदकहरू"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"सक्रिय छ"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"निष्क्रिय छ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सबै रोक्नुहोस्"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"यी सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"सूचनाहरू देखाउनुहोस्"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ओझेलमा वा पेरिफेरल यन्त्रहरूमा कहिल्यै सूचनाहरू नदेखाउनुहोस्"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"आइकनको ब्याजलाई अनुमति दिनुहोस्"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"बाधा नपुर्याउनुहोस् मा ओभरराइड गर्नुहोस्"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"बाधा नपुर्याउनुहोस् प्राथमिकतामा मात्र सेट भएको बेला यी सूचनाहरूबाट हुने अवरोधका लागि अनुमति दिनुहोस्।"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लक स्क्रिनमा"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ब्याट्रीको अप्टिमाइजेसन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ब्याट्रीको प्रयोग सम्बन्धी अलर्ट"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"सबै अनुप्रयोगहरू देखाउनुहोस्"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अनुप्रयोगहरू लुकाउनु"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"यन्त्रको पूर्ण प्रयोग देखाउनुहोस्"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"अनुप्रयोगको प्रयोग देखाउनुहोस्"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"आफू अनुकूल भएको छैन"</string>
     <string name="high_power_on" msgid="6216293998227583810">"आफू अनुकूल नगरिएको"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ब्याट्री प्रयोग आफू अनुकूल गर्दै"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f55cf14..b551f01 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet het volgende kunnen:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aangezien een app een toestemmingsverzoek afdekt, kan Instellingen je reactie niet verifiëren."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Omdat een andere app deze opties afdekt, kan Instellingen niet reageren op je actie."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Als je <xliff:g id="SERVICE">%1$s</xliff:g> inschakelt, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Omdat je een toegankelijkheidsservice hebt ingeschakeld, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Aangezien het inschakelen van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet je je patroon bevestigen."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> geleden"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"App-gebruik sinds volledige lading (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Apparaatgebruik sinds laatste keer volledig opladen (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tijd die het scherm is ingeschakeld sinds volledige lading"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Apparaatgebruik sinds volledige lading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> gebruikt"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Schermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruikt door <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van batterij"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uitsplitsing sinds laatste volledige lading"</string>
@@ -2066,7 +2065,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"Systeem-apps weergeven"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"Systeem weergeven"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"Systeem verbergen"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"Percentages weergeven"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS gebruiken"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Meldingen"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Geavanceerd"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Werkmeldingen"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Pictogrambadges toestaan"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Knipperlicht"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op het vergrendelingsscherm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Content van alle meldingen weergeven"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorieën verwijderd</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categorie verwijderd</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Meldingsbadges"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aan"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Uit"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Deze meldingen nooit weergeven"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Meldingen weergeven"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nooit meldingen weergeven in het meldingenpaneel of op randapparaten"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Pictogrambadge toestaan"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'Niet storen\' overschrijven"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Deze meldingen nog steeds laten onderbreken wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op het vergrendelingsscherm"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batterijoptimalisatie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Gebruiksmeldingen"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Alle apps weergeven"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Extra apps verbergen"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Volledig apparaatgebruik weergeven"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"App-gebruik weergeven"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Niet geoptimaliseerd"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Niet geoptimaliseerd"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Accuverbruik optimaliseren"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index cbadce2..35f72ea 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਵਰਤਣੀ ਹੈ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਇਹ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਅਨੁਮਤੀ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ਕਿਉਂਕਿ ਕੋਈ ਹੋਰ ਐਪ ਇਹਨਾਂ ਵਿਕਲਪਾਂ ਦੇ ਉੱਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ, ਇਸ ਲਈ ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੀ ਕਾਰਵਾਈ \'ਤੇ ਪ੍ਰਤਿਕਿਰਿਆ ਨਹੀਂ ਦੇ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਕਿੰਨੇ ਸਮੇਂ ਤੱਕ ਚਾਲੂ ਰਹੀ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਵਰਤੋਂ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ਲਈ ਵਰਤਿਆ ਗਿਆ"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"ਸਕ੍ਰੀਨ ਵਰਤਣ ਦਾ ਸਮਾਂ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ਵੱਲੋਂ <xliff:g id="PERCENT">%1$s</xliff:g> ਵਰਤੀ ਗਈ"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ਸਮੁੱਚੀ ਬੈਟਰੀ ਦਾ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਦੇ ਵੇਰਵੇ"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"ਉੱਨਤ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"ਪ੍ਰਤੀਕ ਬੈਜਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਸ਼੍ਰੇਣੀ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸ਼੍ਰੇਣੀਆਂ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"ਸੂਚਨਾ ਬੈਜ"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ਚਾਲੂ"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ਬੰਦ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲੌਕ ਕਰੋ"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਦੇ ਨਾ ਵਿਖਾਓ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ਸੂਚਨਾਵਾਂ ਵਿਖਾਓ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਪਰਛਾਵੇਂ ਵਿੱਚ ਜਾਂ ਪੈਰੀਫਿਰਲ ਡੀਵਾਈਸਾਂ \'ਤੇ ਨਾ ਵਿਖਾਓ"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"ਪ੍ਰਤੀਕ ਬੈਜ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਿਰਫ਼ ਤਰਜੀਹ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ਬੈਟਰੀ ਸੁਯੋਗਤਾ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ਵਰਤੋਂ ਬਾਰੇ ਸੁਚੇਤਨਾਵਾਂ"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"ਸਭ ਐਪਾਂ ਵਿਖਾਓ"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"ਵਾਧੂ ਐਪਾਂ ਲੁਕਾਓ"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"ਡੀਵਾਈਸ ਦੀ ਪੂਰੀ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ਐਪ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ਬੈਟਰੀ ਦੇ ਉਪਯੋਗ ਨੂੰ ਅਨੁਕੂਲਿਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 56fb22d..0a806e1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Włączyć <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Wymagania <xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacja Ustawienia nie może zweryfikować Twojej odpowiedzi, ponieważ inna aplikacja zasłania prośbę o udzielenie uprawnień."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Ustawienia nie reagują na działania, ponieważ inna aplikacja jest wyświetlana nad tymi opcjami."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jeśli włączysz usługę <xliff:g id="SERVICE">%1$s</xliff:g>, Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Włączyłeś usługę ułatwień dostępu, więc Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój wzór."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> temu"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Wykorzystanie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Zużycie przez urządzenie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Czas włączenia ekranu od pełnego naładowania"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Korzystanie przez <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Wykorzystanie przez ekran (<xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> zużyte przez: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> całkowitego zużycia baterii"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Zestawienie od ostatniego pełnego naładowania"</string>
@@ -2107,7 +2106,7 @@
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 godzin"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 godzin"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
-    <string name="menu_duration_1d" msgid="3393631127622285458">"24 godziny"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"24 godzin"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Pokaż systemowe"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"Ukryj systemowe"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"Pokaż procent"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Powiadomienia"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Zaawansowane"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Powiadomienia związane z pracą"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Zezwól na ikony z plakietkami"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Migająca dioda"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na ekranie blokady"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokazuj wszystkie powiadomienia"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="other">Usunięto <xliff:g id="COUNT_1">%d</xliff:g> kategorii</item>
       <item quantity="one">Usunięto <xliff:g id="COUNT_0">%d</xliff:g> kategorię</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Plakietki powiadomień"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Wł."</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Wył."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nigdy nie pokazuj tych powiadomień"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Pokazuj powiadomienia"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nigdy nie pokazuj powiadomień w obszarze powiadomień ani na urządzeniach peryferyjnych"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Zezwól na plakietkę z ikoną"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zastąp Nie przeszkadzać"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Zezwól na działanie tych powiadomień, gdy Nie przeszkadzać ma ustawienie Tylko priorytetowe"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na ekranie blokady"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optymalizacja baterii"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alerty o transmisji danych"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Pokaż wszystkie aplikacje"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ukryj aplikacje dodatkowe"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Pokaż pełne zużycie przez urządzenie"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Pokaż zużycie przez aplikacje1"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optymalizacji"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optymalizacji"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ma włączoną optymalizację baterii"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0ac4c68..1ed281f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Como outro app está sendo exibido sobre essas opções, as configurações não podem responder à sua ação."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permitir selos de ícone"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na tela de bloqueio"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categoria excluída</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias excluídas</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Selos de notificação"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ativado"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desativadas"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar essas notificações"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permitir selo de ícone"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todos os apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps extras"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index adca992..664b09c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita de:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Uma vez que uma aplicação está a ocultar um pedido de autorização, as Definições não conseguem validar a sua resposta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Uma vez que outra aplicação está a ser apresentada por cima destas opções, as Definições não podem responder à sua ação."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se ativar o <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Uma vez que ativou um serviço de acessibilidade, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar o seu padrão."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilização de aplicações desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilização do dispositivo desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o qual o ecrã tem estado ativado desde o carregamento completo"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilização do dispositivo desde o carregamento completo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
@@ -1946,8 +1946,8 @@
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="3392999761958982492">"Modo de espera da rede móvel"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inativo"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inativo"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
     <string name="power_apps" msgid="2043554781293951327">"Aplicações"</string>
@@ -1982,8 +1982,8 @@
     <string name="battery_action_wifi" msgid="8181553479021841207">"Definições de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Definições de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilizada por chamadas de voz"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilizada quando o tablet está inactivo"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inactivo"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilizada quando o tablet está inativo"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inativo"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilizada pelo rádio do telefone"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Mudar para modo de avião para poupar energia em áreas sem cobertura de rede"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Bateria utilizada pela lanterna"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Utilizada durante <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Utilização do ecrã: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado pela aplicação <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhes desde o último carregamento completo"</string>
@@ -2465,13 +2464,13 @@
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 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.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Sites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 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.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Sites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Websites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="one">Check certificates</item>
       <item quantity="other">Verificar certificados</item>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permitir emblemas de ícones"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Emitir luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"No ecrã de bloqueio"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas as notificações"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Balões de notificações"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ativadas"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desativadas"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar estas notificações"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações no painel ou nos dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permitir emblema de ícone"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substituir o modo Não incomodar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver definido como Apenas prioridade"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"No ecrã de bloqueio"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização da bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas as aplicações"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicações adicionais"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização completa do dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizada"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizada"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Utilização otimizada da bateria"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0ac4c68..1ed281f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Como outro app está sendo exibido sobre essas opções, as configurações não podem responder à sua ação."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permitir selos de ícone"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na tela de bloqueio"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categoria excluída</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias excluídas</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Selos de notificação"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ativado"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Desativadas"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar essas notificações"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permitir selo de ícone"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todos os apps"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps extras"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e961bab..55f0c34 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1874,7 +1874,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> are funcțiile:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Deoarece o aplicație acoperă o solicitare de permisiune, Setările nu vă pot verifica răspunsul."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Deoarece o altă aplicație se afișează deasupra acestor opțiuni, Setările nu pot răspunde la acțiunea dvs."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Dacă activați <xliff:g id="SERVICE">%1$s</xliff:g>, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pentru că ați activat un serviciu de accesibilitate, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați modelul."</string>
@@ -1935,6 +1934,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"în urmă cu <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizarea de către aplicații de la ultima încărcare (în urmă cu <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilizarea dispozitivului de la ultima încărcare completă (acum <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Perioada de timp de la încărcarea completă cât a fost pornit ecranul"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizarea dispozitivului de la încărcarea completă"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
@@ -2026,8 +2026,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Utilizată <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Utilizarea ecranului: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> folosită de <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> din bateria încărcată complet"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detaliere de la ultima încărcare completă"</string>
@@ -2806,7 +2805,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificări"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avansate"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificări profil de serviciu"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Permiteți insigne pictogramă"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Lumină intermitentă"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pe ecranul de blocare"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișează integral conținutul notificărilor"</string>
@@ -2884,14 +2884,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de categorii șterse</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categorie ștearsă</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Insigne pentru notificare"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Activat"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Dezactivat"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Aceste notificări nu se afișează niciodată"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afișați notificările"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nu afișați niciodată notificările în umbră sau pe dispozitive periferice"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Permiteți insigne pictogramă"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoră Nu deranja"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permiteți acestor notificări să vă întrerupă când modul Nu deranja este setat la Numai cu prioritate"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pe ecranul de blocare"</string>
@@ -3130,8 +3132,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizarea bateriei"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alerte privind utilizarea"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Afișați toate aplicațiile"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ascundeți aplic. suplimentare"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Afișați utilizarea completă a dispozitivului"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Afișați utilizarea aplicațiilor"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizate"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimizată"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Se optimizează utilizarea bateriei"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cdfc6aa..c337372 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1310,7 +1310,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Сбросить настройки?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Этот пользователь не может сбрасывать настройки сети"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Сетевые настройки сброшены"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Сбросить все данные"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Сброс к заводским настройкам"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="one">Будет сброшен <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунт</item>
       <item quantity="few">Будет сброшено <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунта</item>
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> будет:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Невозможно принять ваше согласие, поскольку запрос скрыт другим приложением."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Приложение \"Настройки\" не может ответить на ваше действие, поскольку его закрывает другое приложение."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Если включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\", блокировка экрана будет отключена и надежность защиты зашифрованных данных снизится."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Поскольку включена служба специальных возможностей, блокировка экрана будет отключена и надежность защиты зашифрованных данных может быть снижена."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести графический ключ."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> назад"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Использование приложений с момента полной зарядки (<xliff:g id="TIME">^1</xliff:g> назад)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Использование устройства с момента полной зарядки (прошло: <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Время работы экрана с момента полной зарядки"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Использование устройства с момента полной зарядки"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Время использования: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Использование экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> – <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> заряда батареи"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Использование с момента полной зарядки"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Уведомления"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Расширенные настройки"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Рабочие уведомления"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Показывать наклейки на значках"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Световая индикация"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокированном экране"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показывать уведомления полностью"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="many">Удалено <xliff:g id="COUNT_1">%d</xliff:g> категорий</item>
       <item quantity="other">Удалено <xliff:g id="COUNT_1">%d</xliff:g> категории</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Значки уведомлений"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Вкл."</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Откл."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Не показывать эти уведомления"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Включить уведомления"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Не показывать уведомления на фоне или на периферийных устройствах"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Показывать наклейку на значке"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить \"Не беспокоить\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешить эти уведомления, когда в режиме \"Не беспокоить\" выбрано \"Только важные\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокированном экране"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Экономия заряда батареи"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Предупреждения"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Показать все приложения"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Скрыть доп. приложения"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Вся информация об использовании"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Использование приложений"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не экономят заряд"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не экономит заряд"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Экономия заряда включена"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 998e42d..790062c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> භාවිත කරන්න ද?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> හට අවශ්‍යයි:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"යෙදුම අවසර ඉල්ලීමක් කරන නිසා, සැකසීම් හට ඔබගේ ප්‍රතිචාරය සත්‍යාපනය කළ නොහැක."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"වෙනත් යෙදුමක් මෙම විකල්පවල ඉහළින්ම සංදර්ශනය වන නිසා, සැකසීම්වලට ඔබේ ක්‍රියාවට ප්‍රතිචාර දැක්විය නොහැකිය."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ඔබ <xliff:g id="SERVICE">%1$s</xliff:g> සක්‍රිය කළේ නම්, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ඔබ ප්‍රවේශතා සේවාව සක්‍රිය කළ නිසා, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්‍ය නැත."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්‍රියාත්මක කරන නිසා, ඔබගේ රටාව ඔබට සහතික කිරීමට අවශ්‍යය."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>කට පෙර"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"පූර්ණ ආරෝපණයේ සිට යෙදුම භාවිතය (<xliff:g id="TIME">^1</xliff:g> පෙර)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"පූර්ණ ආරෝපණයේ සිට උපාංග භාවිතය (<xliff:g id="TIME">^1</xliff:g> පෙර)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"පූර්ණ ආරෝපණය සිට තිරය සක්‍රියව තිබූ වේලාව"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"පූර්ණ ආරෝපණයෙන් පසුව උපාංග භාවිතය"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"පේනුවෙන් ඉවත් කළ පසු බැටරි භාවිතය"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"වැඩියෙන් ගණනය කළ බල භාවිතය"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>ක් භාවිත කරන ලදී"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"තිර භාවිතය <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> වෙතින් <xliff:g id="PERCENT">%1$s</xliff:g>ක් භාවිතා කර ඇත"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"සමස්ත බැටරියෙන් <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව ප්‍රභේදනය"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"දැනුම්දීම්"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"උසස්"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"වැඩ දැනුම්දීම්"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"නිරූපක ලාංඡනයට ඉඩ දෙන්න"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"නිවී නිවී දැල්වෙන එළිය"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"අගුලු තිරය මත"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"සියලුම දැනුම්දීමේ අන්තර්ගත පෙන්වන්න"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one">ප්‍රවර්ග <xliff:g id="COUNT_1">%d</xliff:g>ක් මකා දමන ලදි</item>
       <item quantity="other">ප්‍රවර්ග <xliff:g id="COUNT_1">%d</xliff:g>ක් මකා දමන ලදි</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"දැනුම්දීම් බැජ්"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ක්‍රියාත්මකයි"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ක්‍රියාවිරහිතයි"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"සියල්ල අවහිර කරන්න"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"මෙම දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"දැනුම්දීම් පෙන්වන්න"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"සෙවන තුළ හෝ පර්යන්ත උපාංග මත දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"නිරූපක ලාංඡනයට ඉඩ දෙන්න"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"බාධා නොකරන්න ඉක්මවන්න"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"බාධා නොකරන්න, ප්‍රමුඛතා පමණි වෙත සකසා ඇති විට මෙම දැනුම්දීම්වලට බාධා කිරීමට දිගටම ඉඩ දෙන්න"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"අගුලු තිරය මත"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"බැටරි ප්‍රශස්තකරණය"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"භාවිත ඇඟවීම්"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"සියලුම යෙදුම් පෙන්වන්න"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"අමතර යෙදුම් සඟවන්න"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"පූර්ණ උපාංග භාවිතය පෙන්වන්න"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"යෙදුම් භාවිතය පෙන්වන්න"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ප්‍රශස්තකරණය වී නොමැත"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ප්‍රශස්තකරණය වී නොමැත"</string>
     <string name="high_power_off" msgid="3393904131961263278">"බැටරි භාවිතය ප්‍රශස්තකරණය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 27bdad1..a6d637f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Používať službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potrebuje:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Nastavenia nemôžu overiť vašu odpoveď, pretože určitá aplikácia blokuje žiadosť o povolenie."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Nastavenia nemôžu reagovať na vašu akciu, pretože sa nad týmito možnosťami zobrazuje iná aplikácia."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ak zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Keďže ste zapli služby dostupnosti, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoj vzor."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Spotreba aplikácií od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Využitie v zariadení od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ako dlho bola zapnutá obrazovka od úplného dobitia"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Využitie zariadenia od úplného dobitia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Používané <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Využitie obrazovky <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> využila aplikácia <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celkovej výdrže batérie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Prehľad od posledného úplného nabitia"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Upozornenia"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšírené"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovné upozornenia"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Povoliť odznaky na ikonách"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikanie"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na uzamknutej obrazovke"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazovať všetok obsah upozornení"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="other">Bolo odstránených <xliff:g id="COUNT_1">%d</xliff:g> kategórií</item>
       <item quantity="one">Bola odstránená <xliff:g id="COUNT_0">%d</xliff:g> kategória</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Odznaky upozornení"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Zapnuté"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Vypnuté"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Tieto upozornenia nikdy nezobrazovať"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovať upozornenia"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikdy nezobrazovať upozornenia na paneli ani v periférnych zariadeniach"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Povoliť odznak na ikone"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prepísať možnosť Nerušiť"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožniť týmto upozorneniam vyrušiť ma, ak je možnosť Nerušiť nastavená na možnosť Iba prioritné"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na uzamknutej obrazovke"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimalizácia batérie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia o spotrebe"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Zobraziť všetky aplikácie"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Skryť ďalšie aplikácie"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie v zariadení"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Zobraziť využitie aplikácií"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizované"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimalizované"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimalizuje používanie batérie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1b2498a..7cd178d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> mora:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Ker aplikacija zakriva zahtevo za dovoljenje, z nastavitvami ni mogoče preveriti vašega odziva."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Ker te možnosti prekriva druga aplikacija, se aplikacija Nastavitve ne more odzvati na vaše dejanje."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Če vklopite storitev <xliff:g id="SERVICE">%1$s</xliff:g>, vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov, ker ste vklopili storitev za ljudi s posebnimi potrebami."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi vzorec."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Poraba aplik. od napol. akumul. (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uporaba naprave od polne napolnjenosti akumulatorja (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Trajanje vklopljenosti zaslona od polne napolnjenosti akumulatorja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Poraba naprave od polne napolnjenosti akumulatorja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba akumulatorja po odklopu"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Trajanje uporabe: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Uporaba zaslona: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napol. akumulatorja"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obvestila"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Dodatno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obvestila za delovni profil"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Omogoči značko na ikonah"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Utripajoča lučka"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaklenjenem zaslonu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije so izbrisane</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorij je izbrisanih</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Obvestilne značke"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Vklopljeno"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Izklopljeno"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikoli ne prikaži teh obvestil"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Pokaži obvestila"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikoli ne pokaži obvestil na zaslonu z obvestili ali v zunanjih napravah."</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Omogoči značko na ikoni"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Preglasitev načina »Ne moti«"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Naj se ta obvestila prikazujejo tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaklenjenem zaslonu"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija akumulatorja"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Opozorila o porabi"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Pokaži vse aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Skrij dodatne aplikacije"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Prikaz vseh podatkov o uporabi naprave"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaz uporabe aplikacij"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ni optimizirano"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ni optimizirano"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija uporabe akumulatorja"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index e283ba2..795ad51 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Të përdoret \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"\"<xliff:g id="SERVICE">%1$s</xliff:g>\" ka nevojë të:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Duke qenë se një aplikacion po bllokon një kërkesë për leje, \"Cilësimet\" nuk mund të verifikojnë përgjigjen tënde."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Cilësimet nuk mund t\'i përgjigjen veprimit tënd pasi një aplikacion tjetër po shfaqet mbi këto opsione."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nëse aktivizon <xliff:g id="SERVICE">%1$s</xliff:g>, pajisja nuk do të përdorë kyçjen e ekranit për të rritur enkriptimin e të dhënave."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Për shkak se ke aktivizuar shërbimin e qasshmërisë, pajisja jote nuk do të përdorë kyçen e ekranit për përmirësimin e enkriptimit të të dhënave."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Meqenëse aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh motivin tënd."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> më parë"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Përdorimi i apl. që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Përdorimi i pajisjes që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Sasia e kohës për të cilën ekrani ka qenë aktiv që nga ngarkimi i plotë"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Përdorimi i pajisjes që nga ngarkimi i plotë"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Përdorimi i baterisë që nga heqja nga ngarkimi"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Përdorur për <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Përdorimi i ekranit <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> përdorur nga <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> nga e gjithë bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analiza që nga ngarkimi i fundit i plotë"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Njoftime"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Të përparuara"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Njoftimet e punës"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Lejo simbolet e ikonave"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Drita me pulsim"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Në ekranin e kyçjes"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Shfaq të gjithë përmbajtjen e njoftimit"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori u fshinë</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori u fshi</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Simbolet dalluese të njoftimeve"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aktive"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Joaktive"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bllokoji të gjitha"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Mos i shfaq asnjëherë këto njoftime"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Shfaq njoftimet"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Mos shfaq asnjëherë njoftime në hije ose në pajisje periferike"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Simboli dallues i ikonës së lejimit"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anulo \"Mos shqetëso\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lejo që këto njoftime të vazhdojnë të ndërpresin kur \"Mos shqetëso\" është vendosur në \"Vetëm prioritare\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Në ekranin e kyçjes"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizimi i baterisë"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Sinjalizimet për përdorimin"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Shfaq të gjitha aplikacionet"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Fshih aplikacionet shtesë"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Shfaq përdorimin e plotë të pajisjes"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Shfaq përdorimin e aplikacionit"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Jo të optimizuara"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nuk është i optimizuar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizojnë përdorimin e baterisë"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 25267af..261ab5e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1874,7 +1874,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Пошто апликација скрива захтев за дозволу, Подешавања не могу да верификују одговор."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Подешавања не могу да одговоре на радњу јер се нека друга апликација приказује преко ових опција."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако укључите <xliff:g id="SERVICE">%1$s</xliff:g>, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Пошто сте укључили услугу приступачности, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите шаблон."</string>
@@ -1935,6 +1934,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"пре <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Коришћење апликације од потпуног пуњења (пре <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Коришћење уређаја од потпуног пуњења (пре <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Количина времена током којег је екран био укључен од потпуног пуњења"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Коришћење уређаја од потпуног пуњења"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Коришћење батерије након искључивања"</string>
@@ -2026,8 +2026,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Користи се <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Коришћење екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> користи <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> укупног капацитета батерије"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Преглед од последњег потпуног пуњења"</string>
@@ -2806,7 +2805,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Обавештења"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Напредна"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Обавештења за Work"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Дозволи значке на иконама"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Укључи треперење лампице"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На закључаном екрану"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи сав садржај обавештења"</string>
@@ -2884,14 +2884,16 @@
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> категорије су избрисане</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категорија је избрисано</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Значке обавештења"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Укључено"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Искључено"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Никада не приказуј ова обавештења"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Приказуј обавештења"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Обавештења се никада не приказују на траци или периферијским уређајима"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Дозволи значку на икони"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Замени режим Не узнемиравај"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Омогућава да ова обавештења наставе да се приказују када је режим Не узнемиравај подешен на опцију Само приоритетни прекиди"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На закључаном екрану"</string>
@@ -3130,8 +3132,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Оптимизација батерије"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Обавештења о коришћењу"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Прикажи све апликације"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Сакриј додатне апликације"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Прикажи комплетно коришћење уређаја"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи коришћење апликације"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизације"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Без оптимизације"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Оптимизација коришћења батерије"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index aa3ecb1..65b8646 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> behöver:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Svaret kan inte verifieras av Inställningar, eftersom en app skymmer en begäran om behörighet."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Det går inte att använda Inställningar eftersom en annan app visas ovanpå alternativen."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> används inte skärmlåset för att förbättra datakryptering på enheten."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Eftersom du har aktiverat en tillgänglighetstjänst används inte skärmlåset för att förbättra datakryptering på enheten."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta ditt grafiska lösenord."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sedan"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Appanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Enhetsanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Den totala tidsperiod skärmen har varit på sedan den senaste fulladdningen"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsanvändning sedan batteriet var fulladdat"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Har använts i <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Skärmanvändning <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> har använts av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av den totala batterianvändningen"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Fördelning sedan senaste fulladdningen"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Meddelanden"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avancerat"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Jobbaviseringar"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Tillåt ikonmärken"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkande ljus"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låsskärmen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Visa allt aviseringsinnehåll"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier har raderats</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori har raderats</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Aviseringsmärken"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Aktiverat"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Av"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Visa aldrig de här aviseringarna"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Visa aviseringar"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Visa aldrig aviseringar i panelen eller på perifera enheter"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Tillåt ikonmärke"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Åsidosätt Stör ej"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Fortsätt att få dessa aviseringar när Endast prioriterade har angetts för Stör ej"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låsskärmen"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batterioptimering"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Aviseringar om användning"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Visa alla appar"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Dölj extra appar"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Visa fullständig enhetsanvändning"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Visa appanvändning"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Inte optimerade"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Inte optimerad"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Använder optimerad batteriförbrukning"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 07688af..b9c958d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Kwa sababu programu yako inazuia ombi la ruhusa, Mipangilio haiwezi kuthibitisha majibu yako."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Kwa sababu programu nyingine inaonyeshwa juu ya chaguo hizi, Mipangilio haiwezi kutumia hatua uliyochukua."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukiwasha <xliff:g id="SERVICE">%1$s</xliff:g>, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kwa sababu umewasha huduma ya ufikiaji, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha mchoro wako."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> zilizopita"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Matumizi ya programu tangu ilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Matumizi ya kifaa tangu kilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Muda ambao skrini imekuwa ikiwaka tangu chaji ilipojaa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Matumizi ya kifaa tangu ilipojaa chaji"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Imetumika kwa <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Matumizi ya skrini <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> imetumiwa na <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Imetumia <xliff:g id="PERCENT">%1$s</xliff:g> ya chaji ya betri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uchanganuzi tangu mara ya mwisho ilipojaa chaji"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Arifa"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Mipangilio ya kina"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Arifa za kazini"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Ruhusu beji za aikoni"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Mwangaza umemeteke"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Skrini inapofungwa"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Onyesha arifa za maudhui yote"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">Imefuta aina <xliff:g id="COUNT_1">%d</xliff:g></item>
       <item quantity="one">Imefuta aina <xliff:g id="COUNT_0">%d</xliff:g></item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Beji za arifa"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Zimewashwa"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Zimezimwa"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Usionyeshe arifa hizi kamwe"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Onyesha arifa"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Usiwahi kuonyesha arifa kwenye vifaa vya kando au katika kivuli"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Ruhusu beji ya aikoni"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batilisha hali ya \'Usinisumbue\'"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kukatiza wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Skrini inapofungwa"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Kuboresha matumizi ya betri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Arifa za matumizi"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Onyesha programu zote"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ficha programu za ziada"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Onyesha matumizi ya kifaa tangu kilipojaa chaji"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Onyesha matumizi ya programu"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Haijaboreshwa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Haijaboreshwa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Kuboresha matumizi ya betri"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index a69c722..b62c408 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை பயன்படுத்தவா?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> செய்வது:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"அனுமதிக் கோரிக்கையைப் பயன்பாடு மறைப்பதால், அமைப்புகளால் உங்கள் பதிலைச் சரிபார்க்க முடியாது."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"இந்த விருப்பங்களின் மேலே மற்றொரு பயன்பாடு தோன்றுவதால், உங்கள் செயலுக்கு ஏற்ப அமைப்புகளால் செயல்பட முடியவில்லை."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ இயக்கினால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"அணுகல்தன்மை சேவையை இயக்கியுள்ளதால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், வடிவத்தை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> முன்பு"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"முழு சார்ஜ் ஆனதிலிருந்து பயன்பாட்டின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"முழு சார்ஜ் ஆனதிலிருந்து சாதனத்தின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"முழு சார்ஜ் ஆனதிலிருந்து, திரை இயக்கத்தில் இருந்த நேரம்"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"முழு சார்ஜ் ஆனதிலிருந்து சாதன உபயோகம்"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"செருகல் நீக்கப்பட்டதிலிருந்து பேட்டரியின் பயன்பாடு"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ஆற்றல் பயன்பாடு அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>க்குப் பயன்படுத்தியது"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"திரை உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> பயன்படுத்துவது: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ஒட்டுமொத்த பேட்டரியில் <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"கடைசியாக முழுவதும் சார்ஜ் ஆனதிலிருந்து பிரேக் டவுன்"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"அறிவிப்புகள்"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"மேம்பட்டவை"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"பணி அறிவிப்புகள்"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"ஐகான் பேட்ஜ்களை அனுமதி"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ஒளியைச் சிமிட்டு"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"பூட்டுத் திரையில்"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"எல்லா அறிவிப்பு விவரத்தையும் காட்டு"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> வகைகள் நீக்கப்பட்டன</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> வகை நீக்கப்பட்டது</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"அறிவிப்பு பேட்ஜ்கள்"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"இயக்கப்பட்டுள்ளது"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"முடக்கப்பட்டுள்ளது"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"இந்த அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"அறிவிப்புகளைக் காட்டு"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ஷேட்டில் அல்லது துணைச் சாதனங்களில் அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"ஐகான் பேட்ஜை அனுமதிக்கவும்"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"பூட்டுத் திரையில்"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"பேட்டரி மேம்படுத்தல்"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"எல்லா பயன்பாடுகளையும் காட்டு"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"கூடுதல் பயன்பாடுகளை மறை"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"சாதனத்தின் முழு உபயோகத்தைக் காட்டு"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"பயன்பாட்டின் உபயோகத்தை காட்டு"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"மேம்படுத்தப்படாதவை"</string>
     <string name="high_power_on" msgid="6216293998227583810">"மேம்படுத்தப்படாதது"</string>
     <string name="high_power_off" msgid="3393904131961263278">"பேட்டரி உபயோகத்தை மேம்படுத்தும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f15edcf..2b11ad0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక అనువర్తనం అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"ఈ ఎంపికల పైన మరొక యాప్ ప్రదర్శించబడుతున్నందున, సెట్టింగ్‌లు మీ చర్యకు ప్రతిస్పందించడం లేదు."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"మీరు ప్రాప్యత సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> క్రితం"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత అనువర్తన వినియోగం"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత పరికర వినియోగం"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ ఆన్‌లో ఉన్న మొత్తం సమయం"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి పరికర వినియోగం"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"అన్‌ప్లగ్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> పాటు ఉపయోగించబడింది"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"స్క్రీన్ వాడుక <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ఉపయోగించింది"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"మొత్తం బ్యాటరీలో <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"చివరిసారి పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి వినియోగ వివరాలు"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"నోటిఫికేషన్‌లు"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"అధునాతనం"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"కార్యాలయ నోటిఫికేషన్‌లు"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"చిహ్నం బ్యాడ్జ్‌లను అనుమతించండి"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"లాక్ స్క్రీన్‌పై"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"మొత్తం నోటిఫికేషన్ కంటెంట్‌ను చూపు"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> వర్గాలు తొలగించబడ్డాయి</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> వర్గం తొలగించబడింది</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"నోటిఫికేషన్ బ్యాడ్జ్‌లు"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"ఆన్"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ఆఫ్"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"అన్నింటినీ బ్లాక్ చేయండి"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ఈ నోటిఫికేషన్‌లను ఎప్పుడూ చూపవద్దు"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"నోటిఫికేషన్‌లను చూపు"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"నోటిఫికేషన్‌లను ఎన్నడూ షేడ్‌లో లేదా అనుబంధ పరికరాల్లో చూపవద్దు"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"చిహ్నం బ్యాడ్జ్‌ను అనుమతించండి"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"అంతరాయం వద్దుని భర్తీ చేయి"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"అంతరాయం కలిగించవద్దు లక్షణాన్ని ప్రాధాన్యత మాత్రమేకి సెట్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"లాక్ స్క్రీన్‌పై"</string>
@@ -3096,8 +3098,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"బ్యాటరీ అనుకూలీకరణ"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"వినియోగ హెచ్చరికలు"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"అనువర్తనాలన్నీ చూపు"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"అదనపు అనువర్తనాలను దాచు"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"పూర్తి పరికర వినియోగాన్నిచూపండి"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"అనువర్తన వినియోగాన్ని చూపండి"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"అనుకూలీకరించనివి"</string>
     <string name="high_power_on" msgid="6216293998227583810">"అనుకూలీకరించబడలేదు"</string>
     <string name="high_power_off" msgid="3393904131961263278">"బ్యాటరీ వినియోగాన్ని అనుకూలీకరిస్తోంది"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2fb7cbb..2de8d9d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -360,12 +360,12 @@
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ต่อไป"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ข้าม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"เพิ่มลายนิ้วมือ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานแท็บเล็ตนี้ได้หากแท็บเล็ตสูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานอุปกรณ์เครื่องนี้ได้หากอุปกรณ์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานโทรศัพท์เครื่องนี้ได้หากโทรศัพท์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้แท็บเล็ตนี้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้อุปกรณ์นี้ได้หากอุปกรณ์สูญหายหรือถูกขโมย"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้โทรศัพท์นี้ได้หากโทรศัพท์สูญหายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานแท็บเล็ตนี้ได้หากแท็บเล็ตสูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานอุปกรณ์เครื่องนี้ได้หากอุปกรณ์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานโทรศัพท์เครื่องนี้ได้หากโทรศัพท์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้แท็บเล็ตนี้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้อุปกรณ์นี้ได้หากอุปกรณ์สูญหายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้โทรศัพท์นี้ได้หากโทรศัพท์สูญหายหรือถูกขโมย"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ข้ามไปก่อน"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ย้อนกลับ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ค้นหาเซ็นเซอร์"</string>
@@ -383,7 +383,7 @@
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"เพียงแค่แตะเซ็นเซอร์ลายนิ้วมือเพื่อปลุกและปลดล็อกอุปกรณ์"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"เมื่อเห็นไอคอนนี้ คุณยังให้สิทธิ์การซื้อหรือลงชื่อเข้าใช้แอปได้อีกด้วย"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าคุณลักษณะนี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าฟีเจอร์นี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ตั้งค่าการล็อกหน้าจอ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"เสร็จสิ้น"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"อ๊ะ นั่นไม่ใช่เซ็นเซอร์"</string>
@@ -445,9 +445,9 @@
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ปกป้องอุปกรณ์ของคุณ"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ปกป้องโทรศัพท์ของคุณ"</string>
     <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"หากต้องการเพิ่มความปลอดภัย ให้ตั้งค่าการล็อกหน้าจอสำรอง"</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/ทันทีหลังจากเข้าสู่โหมดสลีป"</string>
@@ -483,36 +483,36 @@
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ปิดการล็อกหน้าจอ"</string>
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"นำการปกป้องอุปกรณ์ออกใช่ไหม"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"ต้องการนำการปกป้องโปรไฟล์ออกใช่ไหม"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
 
 </xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN"</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN<xliff:g id="EMPTY_LINE">
 
 </xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
 
 </xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
 
 </xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
-    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
-    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มี PIN<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มี PIN<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
-    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
-    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ใช่ นำออกเลย"</string>
@@ -625,7 +625,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ขั้นสูง"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"เมื่อเปิดบลูทูธ อุปกรณ์ของคุณจะสื่อสารกับอุปกรณ์บลูทูธที่อยู่ใกล้ๆ ได้"</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"แอปและบริการของระบบจะยังสามารถตรวจหาอุปกรณ์บลูทูธได้อยู่เพื่อปรับปรุงความแม่นยำของตำแหน่ง คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"แอปและบริการของระบบจะยังสามารถตรวจหาอุปกรณ์บลูทูธได้อยู่เพื่อปรับปรุงความแม่นยำของตำแหน่ง คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"เชื่อมต่อกับ…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงของสื่อ"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงแฮนด์ฟรี"</string>
@@ -673,7 +673,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ปิด"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"ใช้งานไม่ได้เนื่องจากปิด NFC อยู่"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"เมื่อเปิดคุณลักษณะนี้ไว้ คุณสามารถบีมเนื้อหาแอปไปยังอุปกรณ์อีกเครื่องหนึ่งที่ใช้ NFC ได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถบีมหน้าเว็บ วิดีโอ YouTube รายชื่อติดต่อ และอื่นๆ \n\nเพียงนำอุปกรณ์มาชนกัน (โดยทั่วไปจะหันหลังชนกัน) แล้วแตะหน้าจอ แอปจะกำหนดเนื้อหาที่จะบีม"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"เมื่อเปิดฟีเจอร์นี้ไว้ คุณสามารถบีมเนื้อหาแอปไปยังอุปกรณ์อีกเครื่องหนึ่งที่ใช้ NFC ได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถบีมหน้าเว็บ วิดีโอ YouTube รายชื่อติดต่อ และอื่นๆ \n\nเพียงนำอุปกรณ์มาชนกัน (โดยทั่วไปจะหันหลังชนกัน) แล้วแตะหน้าจอ แอปจะกำหนดเนื้อหาที่จะบีม"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"เปิด WiFi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
@@ -697,7 +697,7 @@
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"เชื่อมต่อเครือข่ายแบบเปิด"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"เชื่อมต่อเครือข่ายสาธารณะคุณภาพสูงโดยอัตโนมัติ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"หากต้องการปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย Wi-Fi ได้ คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"หากต้องการปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย Wi-Fi ได้ คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"เปิดการสแกน Wi-Fi ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>เพื่อปรับปรุงความแม่นยำของตำแหน่ง"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ไม่ต้องแสดงข้อความนี้อีก"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ขณะอยู่ในโหมดสลีป"</string>
@@ -894,7 +894,7 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดคุณลักษณะนี้"</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดฟีเจอร์นี้"</string>
     <string name="emergency_address_title" msgid="3571902448699714454">"อัปเดตที่อยู่ฉุกเฉิน"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ที่อยู่ที่บริการฉุกเฉินจะใช้เป็นตำแหน่งของคุณถ้าคุณโทรหมายเลข 911 ด้วย Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
@@ -976,7 +976,7 @@
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"ระดับความสว่างที่ต้องการ"</string>
     <string name="auto_brightness_off_summary" msgid="7629228736838155268">"ไม่ต้องปรับสำหรับแสงที่มี"</string>
     <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"การใช้งานแบตเตอรี่เพิ่มขึ้น"</string>
-    <string name="auto_brightness_disclaimer" msgid="871436423746343406">"เพิ่มประสิทธิภาพระดับความสว่างสำหรับแสงที่มี เมื่อเปิดคุณลักษณะนี้ คุณจะยังปรับความสว่างชั่วคราวได้"</string>
+    <string name="auto_brightness_disclaimer" msgid="871436423746343406">"เพิ่มประสิทธิภาพระดับความสว่างสำหรับแสงที่มี เมื่อเปิดฟีเจอร์นี้ คุณจะยังปรับความสว่างชั่วคราวได้"</string>
     <string name="night_display_title" msgid="2626451512200357686">"แสงตอนกลางคืน"</string>
     <string name="night_display_text" msgid="1837277457033025056">"แสงตอนกลางคืนแต้มสีเหลืองอำพันบนหน้าจอ ซึ่งจะทำให้ดูหรืออ่านหน้าจอในแสงสลัวได้ง่ายขึ้น และอาจช่วยให้คุณนอนหลับได้ง่ายขึ้นด้วย"</string>
     <string name="night_display_category_schedule" msgid="2044072617637348966">"กำหนดการ"</string>
@@ -1657,8 +1657,8 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"บริการ <xliff:g id="COMP_NAME">%1$s</xliff:g> ถูกใช้งานอยู่"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"ตัวให้บริการ <xliff:g id="COMP_NAME">%1$s</xliff:g> ถูกใช้งานอยู่"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"หยุดบริการของระบบหรือไม่"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"หากคุณหยุดบริการนี้ คุณลักษณะบางอย่างของแท็บเล็ตอาจทำงานได้ไม่ถูกต้องจนกว่าคุณจะปิดเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"หากคุณหยุดบริการนี้ คุณลักษณะบางอย่างของโทรศัพท์อาจทำงานได้ไม่ถูกต้องจนกว่าคุณปิดจะเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"หากคุณหยุดบริการนี้ ฟีเจอร์บางอย่างของแท็บเล็ตอาจทำงานได้ไม่ถูกต้องจนกว่าคุณจะปิดเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"หากคุณหยุดบริการนี้ ฟีเจอร์บางอย่างของโทรศัพท์อาจทำงานได้ไม่ถูกต้องจนกว่าคุณปิดจะเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
     <string name="language_settings" msgid="8758655933029560944">"ภาษาและการป้อนข้อมูล"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ภาษาและการป้อนข้อมูล"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ความช่วยเหลือในการป้อนข้อมูล"</string>
@@ -1756,7 +1756,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"การตั้งค่าการเข้าถึง"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"โปรแกรมอ่านหน้าจอ การแสดงผล ส่วนควบคุมการโต้ตอบ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"การตั้งค่าการมองเห็น"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนคุณลักษณะการเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนฟีเจอร์การเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"โปรแกรมอ่านหน้าจอ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"เสียงและข้อความบนหน้าจอ"</string>
     <string name="display_category_title" msgid="685461049938269166">"การแสดงผล"</string>
@@ -1780,7 +1780,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ทางลัดสำหรับการเข้าถึง"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"บริการทางลัด"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"อนุญาตจากหน้าจอล็อก"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มไว้ 3 วินาทีเพื่อเริ่มคุณลักษณะการเข้าถึง"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มไว้ 3 วินาทีเพื่อเริ่มฟีเจอร์การเข้าถึง"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ข้อความคอนทราสต์สูง"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"อัปเดตการขยายหน้าจอเมื่อเปลี่ยนแอปพลิเคชัน"</string>
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"เนื่องจากแอปหนึ่งได้บดบังคำขอสิทธิ์ ระบบจึงไม่สามารถยืนยันคำตอบของคุณสำหรับการตั้งค่าได้"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"เนื่องจากมีแอปอื่นแสดงทับตัวเลือกเหล่านี้ ระบบจึงไม่สามารถตอบสนองการดำเนินการของคุณได้"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"หากคุณเปิด <xliff:g id="SERVICE">%1$s</xliff:g> อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"เนื่องจากคุณเปิดบริการความสามารถในการเข้าถึง อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"คุณต้องยืนยันรูปแบบ เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>ที่ผ่านมา"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"การใช้งานแอปตั้งแต่ชาร์จจนเต็ม (<xliff:g id="TIME">^1</xliff:g>ที่ผ่านมา)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"การใช้งานอุปกรณ์ครั้งล่าสุดตั้งแต่การชาร์จจนเต็ม (<xliff:g id="TIME">^1</xliff:g> ที่ผ่านมา)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ระยะเวลาที่หน้าจอเปิดตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"การใช้งานอุปกรณ์ตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"การใช้แบตเตอรี่ตั้งแต่ถอดปลั๊ก"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ใช้ไป <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"การใช้งานหน้าจอ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ใช้ไป <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ของแบตเตอรี่ทั้งหมด"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"รายละเอียดนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
@@ -2225,7 +2224,7 @@
     <string name="add_account_label" msgid="7811707265834013767">"เพิ่มบัญชี"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"โปรไฟล์งานยังไม่พร้อมใช้งาน"</string>
     <string name="work_mode_label" msgid="5794470908668593961">"โหมดการทำงาน"</string>
-    <string name="work_mode_summary" msgid="1620246003886940776">"อนุญาตให้โปรไฟล์งานทำงาน ซึ่งรวมถึงแอป การซิงค์ในแบ็กกราวด์ และคุณลักษณะที่เกี่ยวข้อง"</string>
+    <string name="work_mode_summary" msgid="1620246003886940776">"อนุญาตให้โปรไฟล์งานทำงาน ซึ่งรวมถึงแอป การซิงค์ในแบ็กกราวด์ และฟีเจอร์ที่เกี่ยวข้อง"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"นำโปรไฟล์งานออก"</string>
     <string name="background_data" msgid="5779592891375473817">"ข้อมูลพื้นหลัง"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"แอปพลิเคชันสามารถซิงค์ ส่ง และรับข้อมูลได้ตลอดเวลา"</string>
@@ -2331,7 +2330,7 @@
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"เปิดใช้อินเทอร์เน็ตมือถือในเบื้องหลัง"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ในการจำกัดข้อมูลแบ็กกราวด์ในแอปฯ ให้ตั้งขีดจำกัดข้อมูลมือถือก่อน"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"คุณสามารถจำกัดอินเทอร์เน็ตในพื้นหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังแท็บเล็ตโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"การแจ้งเตือน"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"ขั้นสูง"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"การแจ้งเตือนงาน"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"อนุญาตให้ใช้ป้ายไอคอน"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"ไฟกะพริบ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"บนหน้าจอล็อก"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"แสดงเนื้อหาการแจ้งเตือนทั้งหมด"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">ลบแล้ว <xliff:g id="COUNT_1">%d</xliff:g> หมวดหมู่</item>
       <item quantity="one">ลบแล้ว <xliff:g id="COUNT_0">%d</xliff:g> หมวดหมู่</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"ป้ายการแจ้งเตือน"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"เปิด"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ปิด"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ไม่ต้องแสดงการแจ้งเตือน"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"แสดงการแจ้งเตือน"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ไม่ต้องแสดงการแจ้งเตือนในแว่นตาหรืออุปกรณ์ต่อพ่วง"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"อนุญาตให้ใช้ป้ายไอคอน"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ลบล้างห้ามรบกวน"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"อนุญาตให้แสดงการแจ้งเตือนต่อไปเมื่อตั้งค่าห้ามรบกวนเป็นเฉพาะเรื่องสำคัญเท่านั้น"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"บนหน้าจอล็อก"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"การเพิ่มประสิทธิภาพแบตเตอรี่"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"การแจ้งเตือนการใช้งาน"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"แสดงแอปทั้งหมด"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"ซ่อนแอปอื่นๆ"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"แสดงการใช้งานอุปกรณ์แบบเต็ม"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"แสดงการใช้งานแอป"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"เพิ่มประสิทธิภาพการใช้แบตเตอรี"</string>
@@ -3277,7 +3279,7 @@
     <string name="condition_bg_data_title" msgid="2483860304802846542">"โปรแกรมประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"สามารถใช้ข้อมูลแบ็กกราวด์ผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi"</string>
     <string name="condition_work_title" msgid="7293722361184366648">"โปรไฟล์งานปิดอยู่"</string>
-    <string name="condition_work_summary" msgid="7543202177571590378">"ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และคุณลักษณะอื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และฟีเจอร์อื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"\"แสงตอนกลางคืน\" เปิดอยู่"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"แต้มสีเหลืองอำพันบนหน้าจอ ซึ่งอาจช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"คำแนะนำ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1ae5114..b003a1f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Kailangan ng <xliff:g id="SERVICE">%1$s</xliff:g> na:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Dahil pinipigilan ng isang app ang kahilingan ng pahintulot, hindi ma-verify ng Mga Setting ang iyong tugon."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Hindi makatugon ang Mga Setting sa iyong pagkilos dahil may ibang app na ipinapakita sa harap ng mga opsyong ito."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kung io-on mo ang <xliff:g id="SERVICE">%1$s</xliff:g>, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Dahil nag-on ka ng serbisyo sa accessibility, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong pattern."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> na ang nakalipas"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Paggamit ng device mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Haba ng oras na naka-on ang screen mula noong napuno ang baterya"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Paggamit ng device mula noong napuno ang baterya"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Ginamit nang <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Paggamit ng screen <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ang ginagamit ng <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ng kabuuang baterya"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown mula noong huling napuno ang baterya"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Mga Notification"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Mga notification sa trabaho"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Payagan ang mga badge ng icon"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Patay-sinding ilaw"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sa lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng content ng notification"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="one">Na-delete ang <xliff:g id="COUNT_1">%d</xliff:g> kategorya</item>
       <item quantity="other">Na-delete ang <xliff:g id="COUNT_1">%d</xliff:g> na kategorya</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Mga notification badge"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Naka-on"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Naka-off"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Huwag kailanman ipakita ang mga notification na ito"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Magpakita ng mga notification"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Huwag kailanman magpakita ng mga notification sa shade o sa mga peripheral na device"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Payagan ang badge ng icon"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"I-override ang Huwag Istorbohin"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Pahintulutan ang mga notification na ito na lumabas kapag nakatakda sa Priyoridad Lang ang Huwag Istorbohin"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sa lock screen"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Pag-optimize ng baterya"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Mga alerto sa paggamit"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Ipakita ang lahat ng app"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Itago ang mga karagdagang app"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Ipakita ang kumpletong paggamit ng device"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Ipakita ang paggamit ng app"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Hindi naka-optimize"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Hindi naka-optimize"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Pag-optimize sa paggamit ng baterya"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4b7c4bb..c8e65e8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> şunları gerektiriyor:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Bir uygulama bir izin isteğinin anlaşılmasını engellediğinden, Ayarlar, yanıtınızı doğrulayamıyor."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Bu seçeneklerin üstünde başka bir uygulama görüntülendiğinden Ayarlar, işleminize yanıt veremiyor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini açarsanız cihazınız veri şifrelemeyi geliştirmek için ekran kilidinizi kullanmaz."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Bir erişilebilirlik hizmetini açtığınız için cihazınız veri şifrelemeyi geliştirmek üzere ekran kilidinizi kullanmayacak."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden deseninizi doğrulamanız gerekmektedir."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> önce"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam şarj sonrası uygulama kullanımı (<xliff:g id="TIME">^1</xliff:g> önce)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Tam şarjdan sonra (<xliff:g id="TIME">^1</xliff:g> önce) cihaz kullanımı"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tam şarjdan sonra ekranın açık olduğu süre"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarj sonrası cihaz kullanımı"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> süreyle kullanıldı"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ekran kullanım süresi: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kadarı <xliff:g id="APP">%2$s</xliff:g> tarafından kullanılıyor"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Toplam pilin <xliff:g id="PERCENT">%1$s</xliff:g> kadarı"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Son tam şarj sonrası kullanım dökümü"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirimler"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Gelişmiş"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"İş bildirimleri"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Simge rozetlerine izin ver"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Işığı yakıp söndür"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Kilit ekranında"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirim içeriğinin tamamını göster"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori silindi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori silindi</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Bildirim rozetleri"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Açık"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Kapalı"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirimleri hiçbir zaman gösterme"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirim göster"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirimleri hiçbir zaman gölgede veya çevre birimi cihazlarında gösterme"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Resim rozete izin ver"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Rahatsız Etmeyin ayarını geçersiz kıl"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Rahatsız Etmeyin seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken, bu bildirimlerin kesmeye devam etmesine izin ver"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Kilit ekranında"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Pil optimizasyonu"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Kullanım uyarıları"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Tüm uygulamaları göster"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ekstra uygulamaları gizle"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz kullanımını göster"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Uygulama kullanımını göster"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Optimize edilmeyenler"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Optimize edilmedi"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Pil kullanımı optimize ediliyor"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fafc756..414d989 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1894,7 +1894,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Службі <xliff:g id="SERVICE">%1$s</xliff:g> потрібно:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Вашу відповідь не видно в Налаштуваннях, оскільки інший додаток загороджує запит на дозвіл."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Оскільки поверх цих опцій відображається інший додаток, налаштування не можуть реагувати на ваші дії."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Якщо ви ввімкнете службу <xliff:g id="SERVICE">%1$s</xliff:g>, дані на пристрої не захищатимуться екраном блокування."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Оскільки ви ввімкнули службу доступності, дані на пристрої не захищатимуться екраном блокування."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити ключ."</string>
@@ -1956,6 +1955,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> тому"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Використання додатками після повного заряджання (<xliff:g id="TIME">^1</xliff:g> тому)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Використання пристрою від повного заряду акумулятора (<xliff:g id="TIME">^1</xliff:g> тому)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Час з увімкненим екраном після повного заряджання"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Викор. пристроєм після повного заряджання"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Споживання акумулятора з часу відключення"</string>
@@ -2047,8 +2047,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Час використання: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Використання екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> заряду використовує додаток <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> усього заряду"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Використання після повного заряджання"</string>
@@ -2833,7 +2832,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Сповіщення"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Розширені налаштування"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Робочі сповіщення"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Показувати значки сповіщень"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Блимання"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокованому екрані"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
@@ -2914,14 +2914,16 @@
       <item quantity="many">Видалено <xliff:g id="COUNT_1">%d</xliff:g> категорій</item>
       <item quantity="other">Видалено <xliff:g id="COUNT_1">%d</xliff:g> категорії</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Значки сповіщень"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Увімкнено"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Вимкнено"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокувати всі"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколи не показувати ці сповіщення"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Показувати сповіщення"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколи не показувати сповіщення на панелі та периферійних пристроях"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Дозволити значок"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Заміна режиму \"Не турбувати\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Показувати ці сповіщення, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокованому екрані"</string>
@@ -3166,8 +3168,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Оптимізація акумулятора"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Сповіщення про використання"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Показати всі додатки"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Сховати зайві додатки"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Показати повне використання пристрою"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Показати використання додатка"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Додатки без оптимізації"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не оптимізовано"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Використання акумулятора оптимізується"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 182ae57..00f6337 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> کا استعمال کریں؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> کو ضرورت ہے:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"چونکہ ایک ایپ اجازت کی درخواست کو مبہم کر رہی ہے، لہذا ترتیبات آپ کے جواب کی توثیق نہیں کر سکتی ہے۔"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"کیونکہ ایک اور ایپ ان اختیارات میں سے سب سے اوپر ڈسپلے ہو رہی ہے، ترتیبات آپ کی کارروائی کا جواب نہیں دے سکتی۔"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر آپ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرتے ہیں تو آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"چونکہ آپ نے ایکسیسبیلٹی کی ایک سروس کو آن کیا ہے لہذا آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے پیٹرن کی توثیق کرنے کی ضرورت ہے۔"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"مکمل چارج کے بعد سے ایپ کا استعمال (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"مکمل چارج کے بعد سے آلہ کا استعمال (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"مکمل چارج کے بعد سے اسکرین آن ہونے کے وقت کی مقدار"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"مکمل چارج کے بعد سے آلہ کا استعمال"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> کیلئے استعمال کیا گیا"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"اسکرین کا استعمال <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> کے ذریعے <xliff:g id="PERCENT">%1$s</xliff:g> استعمال کیا گیا"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"مجموعی بیٹری میں سے <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"پچھلے مکمل چارج کے بعد سے تجزیہ"</string>
@@ -2777,7 +2776,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"اطلاعات"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"جدید ترین"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"دفتری اطلاعات"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"آئیکن بیجز کی اجازت دیں"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"بلنک لائٹ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"قفل اسکرین پر"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"سبھی اطلاعی مواد دکھائیں"</string>
@@ -2852,14 +2852,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> زمرے حذف کئے گئے</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> زمرہ حذف کیا گیا</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"اطلاعی بَیجز"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"آن"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"آف"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"یہ اطلاعات کبھی مت دکھائیں"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"اطلاعات دکھائیں"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"شیڈ میں یا پیریفرل آلات پر کبھی بھی اطلاعات نہ دکھائیں"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"آئیکن بیج کی اجازت دیں"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ڈسٹرب نہ کریں کو اوور رائیڈ کریں"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"جب \'ڈسٹرب نہ کریں\' صرف ترجیح پر سیٹ ہو تو ان اطلاعات کو مداخلت کرنے دیں"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"قفل اسکرین پر"</string>
@@ -3092,8 +3094,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"بیٹری بہترین بنانا"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"استعمال سے متعلق الرٹس"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"سبھی ایپس دکھائیں"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"اضافی ایپس چھپائیں"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"آلہ کا مکمل استعمال دکھائیں"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"ایپ کا استعمال دکھائیں"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بہترین بنائی گئی نہیں ہیں"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بہترین بنائی گئی نہیں ہیں"</string>
     <string name="high_power_off" msgid="3393904131961263278">"بیٹری استعمال کو بہترین بنا رہی ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index e82b166..f88d1c0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Ilova ruxsatnoma so‘roviga xalaqit qilayotgani tufayli, “Sozlamalar” ilovasi javobingizni tekshira olmaydi."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Chunki boshqa ilova bu parametrlar ustidan ko‘rsatilmoqda, Sozlamalar amallaringizga javob bera olmaydi."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Agar <xliff:g id="SERVICE">%1$s</xliff:g> xizmatini yoqsangiz, qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Maxsus imkoniyatlar xizmati yoqilganligi tufayli qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois chizmali parolingizni tasdiqlashingiz lozim."</string>
@@ -1918,6 +1917,9 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for power_usage_list_summary (6775339745194635000) -->
     <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for power_usage_list_summary_device (7036566616386864302) -->
+    <skip />
     <string name="screen_usage_summary" msgid="6687403051423153550">"To‘liq quvvat olganidan beri ekran yoniq turgan vaqt miqdori"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"To‘liq quvvat olganidan beri qurilmaning quvvat sarfi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Quvvat manbaidan uzilganidan keyin sarflangan batareya quvvati"</string>
@@ -2009,8 +2011,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Ishlatilgan vaqti: <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrandan foydalanish: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
     <!-- String.format failed for translation -->
@@ -2789,7 +2790,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirishnomalar"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Kengaytirilgan sozlamalar"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ishga oid bildirishnomalar"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Nishonchalarga ruxsat berish"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Indikator"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Qulflangan ekranda"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirishnomalar to‘liq chiqsin"</string>
@@ -2864,14 +2866,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta turkum o‘chirib tashlandi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta turkum o‘chirib tashlandi</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Bildirishnoma nishonchalari"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Yoniq"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"O‘chiq"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Hammasini bloklash"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirishnomalar boshqa ko‘rsatilmasin"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirishnomalar ko‘rsatilsin"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Fonda yoki tashqi qurilmalarda bildirishnomalar hech qachon ko‘rsatilmasin"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Nishonchaga ruxsat berish"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bezovta qilinmasin rejimi ustidan yozish"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Bezovta qilinmasin rejimida faqat muhim bildirishnomalarga ruxsat berilgan bo‘lsa, ushbu bildirishnomalarga ham ruxsat beriladi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Qulflangan ekranda"</string>
@@ -3104,8 +3108,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Batareya quvvatini tejash"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Ogohlantirishlar"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Barcha ilovalarni ko‘rsatish"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Qo‘shimcha ilovalarni berkitish"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Butun qurilmaning quvvat sarfi"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Ilovalardan foydalanish"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Quvvat tejamaydi"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Quvvat tejamaydi"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya cheklovi o‘rnatilgan"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4063326..812ca8a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> cần:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Vì ứng dụng đang che khuất yêu cầu cấp quyền, Cài đặt không thể xác minh câu trả lời của bạn."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Do một ứng dụng khác đang hiển thị ở phía trên các tùy chọn này nên Cài đặt không thể phản hồi với tác vụ của bạn."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nếu bạn bật <xliff:g id="SERVICE">%1$s</xliff:g>, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vì bạn đã bật dịch vụ trợ năng, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hưởng đến mã hóa dữ liệu, bạn cần phải xác nhận hình của mình."</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"cách đây <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Mức sử dụng ứng dụng kể từ khi sạc đầy (cách đây <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Sử dụng thiết bị kể từ khi sạc đầy (<xliff:g id="TIME">^1</xliff:g> trước)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Lượng thời gian sử dụng màn hình kể từ khi sạc đầy"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Mức sử dụng thiết bị kể từ lần sạc đầy"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Được sử dụng cho <xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Thời gian sử dụng màn hình <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> được sử dụng bởi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> trong tổng số thời lượng pin"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Chi tiết từ lần sạc đầy gần đây nhất"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Thông báo"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Nâng cao"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Thông báo công việc"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Cho phép huy hiệu biểu tượng"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Đèn nhấp nháy"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Trên màn hình khóa"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Hiển thị tất cả nội dung thông báo"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">Đã xóa <xliff:g id="COUNT_1">%d</xliff:g> danh mục</item>
       <item quantity="one">Đã xóa <xliff:g id="COUNT_0">%d</xliff:g> danh mục</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Huy hiệu thông báo"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Bật"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Tắt"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Không bao giờ hiển thị các thông báo này"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Hiển thị thông báo"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Không bao giờ hiển thị thông báo trong ngăn thông báo hoặc trên thiết bị ngoại vi"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Cho phép huy hiệu biểu tượng"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ghi đè Không làm phiền"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Cho phép các thông báo này tiếp tục làm gián đoạn khi tính năng Không làm phiền được đặt thành Chỉ ưu tiên."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Trên màn hình khóa"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Tối ưu hóa pin"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Thông báo về mức sử dụng"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Hiển thị tất cả các ứng dụng"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Ẩn ứng dụng bổ sung"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Hiển thị dữ liệu sử dụng thiết bị đầy đủ"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Hiển thị dữ liệu sử dụng ứng dụng"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Không được tối ưu hóa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Không được tối ưu hóa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Tối ưu hóa mức sử dụng pin"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0eb4cdd..4cbb7e6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"由于某个应用遮挡了权限请求界面，因此“设置”应用无法验证您的回应。"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"由于另一个应用目前正显示在这些选项上，“设置”无法回应您的操作。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启<xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"由于您已开启无障碍服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的解锁图案。"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"充满电（<xliff:g id="TIME">^1</xliff:g>前）后的应用用电量"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充满电（<xliff:g id="TIME">^1</xliff:g>前）后的设备用电量"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"充满电后的屏幕使用时间"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"充满电后的设备用电量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"屏幕使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用电量占 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整体用电量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"自上次充满电后的用电明细"</string>
@@ -2779,7 +2778,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"高级"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"允许在图标上显示标记"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"闪烁指示灯"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"屏幕锁定时"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"显示所有通知内容"</string>
@@ -2854,14 +2854,16 @@
       <item quantity="other">已删除 <xliff:g id="COUNT_1">%d</xliff:g> 个类别</item>
       <item quantity="one">已删除 <xliff:g id="COUNT_0">%d</xliff:g> 个类别</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"通知标记"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"开启"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"关闭"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部屏蔽"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"一律不显示这类通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"显示通知"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"一律不在通知栏或外围设备上显示通知"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"允许在图标上显示标记"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆盖“勿扰”设置"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当勿扰模式设为“仅限优先事项”时，允许继续接收这类通知"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"屏幕锁定时"</string>
@@ -3094,8 +3096,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"电池优化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"电池用量提醒"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"显示所有应用"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"隐藏其他应用"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"显示完整的设备用电量"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"显示应用使用情况"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未优化"</string>
     <string name="high_power_on" msgid="6216293998227583810">"未优化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"优化电池使用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 56a8df5..52a5d15 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1855,7 +1855,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"由於有應用程式阻礙權限請求，「設定」無法驗證您的回覆。"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"由於另一個應用程式正在這些選項上顯示內容，因此「設定」無法回應您的操作。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您開啟<xliff:g id="SERVICE">%1$s</xliff:g>，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"因為您已開啟無障礙功能，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度，因此您需要確認解鎖圖案。"</string>
@@ -1915,6 +1914,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"充滿電後的應用程式用量 (<xliff:g id="TIME">^1</xliff:g>前)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充滿電 (<xliff:g id="TIME">^1</xliff:g>前) 後的裝置用電量"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"充滿電後的螢幕開啟時間"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"充滿電後的裝置用量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
@@ -2006,8 +2006,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"螢幕使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充滿電後的詳細用量"</string>
@@ -2782,7 +2781,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"允許使用圖示標籤"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃燈"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定畫面上"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -2857,14 +2857,16 @@
       <item quantity="other">已刪除 <xliff:g id="COUNT_1">%d</xliff:g> 個類別</item>
       <item quantity="one">已刪除 <xliff:g id="COUNT_0">%d</xliff:g> 個類別</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"通知標誌"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"開啟"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"關閉"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"永不顯示這些通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"永不在通知欄或周邊裝置上顯示通知"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"允許顯示狀態標籤圖示"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"取代「請勿騷擾」"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「請勿騷擾」設定為「只限優先」時，允許顯示這些通知"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定畫面上"</string>
@@ -3097,8 +3099,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"電池優化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"顯示應用程式使用情況"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"尚未優化"</string>
     <string name="high_power_on" msgid="6216293998227583810">"尚未優化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"正在優化電池使用"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 38a59e3..f02563e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1854,7 +1854,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作："</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"權限要求遭到其他應用程式畫面遮掩，因此「設定」無法驗證你的回應。"</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"另一個應用程式目前顯示在畫面上層，覆蓋了這些選項，因此「設定」應用程式無法回應你的動作。"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果你開啟 <xliff:g id="SERVICE">%1$s</xliff:g>，你的裝置將無法使用螢幕鎖定加強資料加密。"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"你已開啟協助工具服務，因此你的裝置無法使用螢幕鎖定加強資料加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須畫出解鎖圖案。"</string>
@@ -1914,6 +1913,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>之前"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"充飽電 (<xliff:g id="TIME">^1</xliff:g>之前) 後的應用程式用電量"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充飽電 (<xliff:g id="TIME">^1</xliff:g>之前) 後的裝置用電量"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"充飽後的螢幕點亮時間"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"充飽後的裝置用量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
@@ -2005,8 +2005,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"螢幕使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充飽後的詳細用量資訊"</string>
@@ -2762,7 +2761,7 @@
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"設定「零打擾」規則"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"在特定時間禁用音效和震動"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅限優先通知"</string>
-    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅允許鬧鐘"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅限鬧鐘"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全靜音"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"封鎖視覺干擾"</string>
@@ -2783,7 +2782,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work 通知"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"允許在圖示上顯示標記"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃爍燈光"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定時"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -2858,14 +2858,16 @@
       <item quantity="other">已刪除 <xliff:g id="COUNT_1">%d</xliff:g> 個類別</item>
       <item quantity="one">已刪除 <xliff:g id="COUNT_0">%d</xliff:g> 個類別</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"通知狀態標籤"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"開啟"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"關閉"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"一律不顯示這類通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"一律不在通知欄或週邊裝置上顯示通知"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"允許加上狀態標籤圖示"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆寫「零打擾」模式設定"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「零打擾」模式設定為「僅限優先通知」時，允許這些通知繼續干擾"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定時"</string>
@@ -3098,8 +3100,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"電池效能最佳化"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"電池用量警示"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"應用程式使用情況"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未套用最佳化設定"</string>
     <string name="high_power_on" msgid="6216293998227583810">"未套用最佳化設定"</string>
     <string name="high_power_off" msgid="3393904131961263278">"採用電池效能最佳化設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 422c1e2..4d2304b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1855,7 +1855,6 @@
     <string name="enable_service_title" msgid="3061307612673835592">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> idinga :"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Ngoba uhlelo lokusebenza lusitha isicelo semvume, Izilungiselelo azikwazi ukuqinisekisa impendulo yakho."</string>
-    <string name="window_obscured_warning" msgid="8711643931674708175">"Ngoba olunye uhlelo libonisa phezulu kwalezi zinketho, izilungiselelo azikwazi ukuphendula esenzweni sakho."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Uma uvula i-<xliff:g id="SERVICE">%1$s</xliff:g>, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini sakho ukuthuthukisa ukubethelwa kwedatha."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Ngoba uvule isevisi yokufinyelela, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini ukuthuthukisa ukubethelwa kwedatha."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphethini yakho."</string>
@@ -1915,6 +1914,7 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> okwedlule"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Ukusebenza kohlelo lokusebenza kusuka ekushajeni okuphelele (<xliff:g id="TIME">^1</xliff:g> okwedlule)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ukusetshenziswa kwedivayisi kusukela ngemuva kokushajwa kugcwale (<xliff:g id="TIME">^1</xliff:g> edlule)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Inani lesikhathi isikrini sivuliwe kusuka ekushijeni okuphelele"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ukusebenza kwedivayisi kusuka ekushajeni okuphelele"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhethri kusukela inqamuliwe"</string>
@@ -2006,8 +2006,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Kusetshenziswe nge-<xliff:g id="TIME">^1</xliff:g>"</string>
-    <!-- no translation found for battery_screen_usage (6537658662149713585) -->
-    <skip />
+    <string name="battery_screen_usage" msgid="6537658662149713585">"Ukusetshenziswa kwesikrini <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kusetshenziswe yi-<xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kwalo lonke ibhethri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ukwaphuka kusuka ekushajeni okuphelele"</string>
@@ -2780,7 +2779,8 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Izaziso"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Okuthuthukisiwe"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Izaziso zomsebenzi"</string>
-    <string name="notification_badging_title" msgid="5125022693565388760">"Vumela amabheji esithonjana"</string>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1905382958860387030">"Cwabizisa ukukhanya"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Ekukhiyeni kwesikrini"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bonisa konke okuqukethwe kwesaziso"</string>
@@ -2855,14 +2855,16 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izigaba zisusiwe</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izigaba zisusiwe</item>
     </plurals>
-    <string name="notification_badges" msgid="4468378071033143539">"Amabheji esaziso"</string>
     <string name="notification_toggle_on" msgid="650145396718191048">"Vuliwe"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Kuvaliwe"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ungalokothi ubonise lezi zaziso"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bonisa izaziso"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ungalokothi ubonise izaziso kumthunzi noma kumadivayisi alawulwa ikhompuyutha"</string>
-    <string name="notification_badge_title" msgid="7734903868300369178">"Vumela ibheji lesithonjana"</string>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bhala ngaphezulu okuthi ungaphazamisi"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Vumela lezi zaziso ziqhubeke nokuphazamisa uma okuthi ungaphazamisi kusethelwe okuphezulu kuphela"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekukhiyeni kwesikrini"</string>
@@ -3095,8 +3097,8 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Ukulungiselelwa kwebhethri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Izexwayiso zokusetshenziswa"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Bonisa zonke izinhlelo zokusebenza"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Fihla izinhlelo zokusebenza ezingeziwe"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Bonisa ukusetshenziswa kwedivayisi okugcwele"</string>
+    <string name="hide_extra_apps" msgid="5016497281322459633">"Bonisa ukusetshenziswa kohlelo lokusebenza"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Akulungiselelwe"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Akulungiselelwe"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ilungiselela ukusetshenziswa kwebhethri"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89be8c7..2f7aa64 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,8 +31,6 @@
     <string name="dlg_switch">Switch</string>
 
     <!-- Device Info --> <skip />
-    <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
-    <string name="device_info_default">Unknown</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
     <plurals name="show_dev_countdown">
         <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 7482031..230f612 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -74,7 +74,7 @@
         <!-- Security patch level -->
         <Preference android:key="security_patch"
                 android:title="@string/security_patch"
-                android:summary="@string/device_info_default">
+                android:summary="@string/summary_placeholder">
                 <intent android:action="android.intent.action.VIEW"
                         android:data="https://source.android.com/security/bulletin/" />
         </Preference>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index e063d13..77063bd 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -24,7 +24,7 @@
             android:key="location_mode"
             android:title="@string/location_mode_title"
             settings:keywords="@string/keywords_location_mode"
-            android:summary="@string/location_mode_location_off_title" />
+            android:summary="@string/summary_placeholder" />
 
         <!-- This preference category gets removed if there is no managed profile -->
         <com.android.settingslib.RestrictedSwitchPreference
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 5d5958d..fafbbb0 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -29,7 +29,7 @@
         <!-- Buttons -->
         <com.android.settings.applications.LayoutPreference
             android:key="buttons"
-            android:layout="@layout/two_buttons_panel"
+            android:layout="@layout/wifi_network_details_two_buttons_panel"
             android:selectable="false" />
 
         <com.android.settings.wifi.WifiDetailPreference
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index fb2f29f..5978f5e 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -40,6 +40,7 @@
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.RemoteCallback;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -90,6 +91,7 @@
     public static final String EXTRA_CALLED_FROM_SUPPORT_DIALOG =
             "android.app.extra.CALLED_FROM_SUPPORT_DIALOG";
 
+    private final IBinder mToken = new Binder();
     Handler mHandler;
 
     DevicePolicyManager mDPM;
@@ -118,8 +120,6 @@
     boolean mWaitingForRemoveMsg;
     boolean mAddingProfileOwner;
     boolean mAdminPoliciesInitialized;
-    int mCurSysAppOpMode;
-    int mCurToastAppOpMode;
 
     boolean mIsCalledFromSupportDialog = false;
 
@@ -352,6 +352,9 @@
         restrictedAction.setFilterTouchesWhenObscured(true);
         restrictedAction.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
+                if (!mActionButton.isEnabled()) {
+                    return;
+                }
                 if (mAdding) {
                     addAndFinish();
                 } else if (isManagedProfile(mDeviceAdmin)
@@ -473,24 +476,21 @@
     @Override
     protected void onResume() {
         super.onResume();
+        mActionButton.setEnabled(true);
         updateInterface();
-        // As long as we are running, don't let this admin overlay stuff on top of the screen.
-        final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;
-        final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;
-        mCurSysAppOpMode = mAppOps.checkOp(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg);
-        mCurToastAppOpMode = mAppOps.checkOp(AppOpsManager.OP_TOAST_WINDOW, uid, pkg);
-        mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);
-        mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);
+        // As long as we are running, don't let anyone overlay stuff on top of the screen.
+        mAppOps.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, true, mToken);
+        mAppOps.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW, true, mToken);
+
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        // As long as we are running, don't let this admin overlay stuff on top of the screen.
-        final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;
-        final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;
-        mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, mCurSysAppOpMode);
-        mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, mCurToastAppOpMode);
+        // This just greys out the button. The actual listener is attached to R.id.restricted_action
+        mActionButton.setEnabled(false);
+        mAppOps.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, false, mToken);
+        mAppOps.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW, false, mToken);
         try {
             ActivityManager.getService().resumeAppSwitches();
         } catch (RemoteException e) {
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3e45af7..4045fd2 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -842,8 +842,7 @@
 
         // Enable/disable backup settings depending on whether the user is admin.
         setTileEnabled(new ComponentName(packageName,
-                        BackupSettingsActivity.class.getName()), true,
-                isAdmin || Utils.isCarrierDemoUser(this));
+                        BackupSettingsActivity.class.getName()), true, isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
                         Settings.WifiDisplaySettingsActivity.class.getName()),
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 0142ea2..9655fd2 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -25,6 +25,7 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.AppGlobals;
+import android.app.AppOpsManager;
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.IActivityManager;
@@ -1272,6 +1273,22 @@
         return info.enabled ? R.string.installed : R.string.disabled;
     }
 
+    /**
+     * Control if other apps can display overlays. By default this is allowed. Be sure to
+     * re-enable overlays, as the effect is system-wide.
+     */
+    public static void setOverlayAllowed(Context context, IBinder token, boolean allowed) {
+        AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class);
+        if (appOpsManager != null) {
+            appOpsManager.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
+                    !allowed, token);
+            appOpsManager.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW,
+                    !allowed, token);
+        }
+    }
+
+
+
     private static boolean isVolumeValid(VolumeInfo volume) {
         return (volume != null) && (volume.getType() == VolumeInfo.TYPE_PRIVATE)
                 && volume.isMountedReadable();
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index e0c58db..e0d2c69 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -48,14 +48,14 @@
                 .setTitle(parentActivity.getString(R.string.enable_service_title,
                         getServiceName(parentActivity, info)))
                 .setView(createEnableDialogContentView(parentActivity, info))
-                .setCancelable(true)
                 .setPositiveButton(android.R.string.ok, listener)
                 .setNegativeButton(android.R.string.cancel, listener)
                 .create();
 
         final View.OnTouchListener filterTouchListener = (View v, MotionEvent event) -> {
             // Filter obscured touches by consuming them.
-            if ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0) {
+            if (((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0)
+                || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
                 if (event.getAction() == MotionEvent.ACTION_UP) {
                     Toast.makeText(v.getContext(), R.string.touch_filtered_warning,
                             Toast.LENGTH_SHORT).show();
@@ -67,6 +67,8 @@
 
         ad.create();
         ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
+        ad.setCanceledOnTouchOutside(true);
+
         return ad;
     }
 
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index d7749ea..38e6b0f 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -17,25 +17,24 @@
 
 import static android.content.DialogInterface.BUTTON_POSITIVE;
 
+import static com.android.settings.Utils.setOverlayAllowed;
+
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.ComponentName;
 import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageParser;
+import android.os.Binder;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.DialogCreatable;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -118,6 +117,7 @@
             implements DialogInterface.OnClickListener {
         private static final String EXTRA_KEY = "extra_key";
         private static final String TAG = "ConfirmationDialogFragment";
+        private IBinder mToken;
 
         public static ConfirmationDialogFragment newInstance(ShortcutServicePickerFragment parent,
                 String key) {
@@ -126,6 +126,7 @@
             argument.putString(EXTRA_KEY, key);
             fragment.setArguments(argument);
             fragment.setTargetFragment(parent, 0);
+            fragment.mToken = new Binder();
             return fragment;
         }
 
@@ -147,6 +148,22 @@
         }
 
         @Override
+        public void onResume() {
+            super.onResume();
+            if (mToken != null) {
+                setOverlayAllowed(getActivity(), mToken, false);
+            }
+        }
+
+        @Override
+        public void onPause() {
+            super.onPause();
+            if (mToken != null) {
+                setOverlayAllowed(getActivity(), mToken, true);
+            }
+        }
+
+        @Override
         public void onClick(DialogInterface dialog, int which) {
             final Fragment fragment = getTargetFragment();
             if ((which == BUTTON_POSITIVE) && (fragment instanceof DefaultAppPickerFragment)) {
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 9c01a5f..da4bdcf 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -16,34 +16,30 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.settings.Utils.setOverlayAllowed;
+
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.UserHandle;
 import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
@@ -77,6 +73,8 @@
 
     private int mShownDialogId;
 
+    private final IBinder mToken = new Binder();
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY_SERVICE;
@@ -107,12 +105,18 @@
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
         updateSwitchBarToggleSwitch();
+        if (mToken != null) {
+            setOverlayAllowed(getActivity(), mToken, false);
+        }
         super.onResume();
     }
 
     @Override
     public void onPause() {
         mSettingsContentObserver.unregister(getContentResolver());
+        if (mToken != null) {
+            setOverlayAllowed(getActivity(), mToken, true);
+        }
         super.onPause();
     }
 
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 5ad5e48..e21ab7e 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -543,8 +543,8 @@
             mClearCacheButton.setEnabled(false);
         } else {
             long codeSize = result.getCodeBytes();
-            long dataSize = result.getDataBytes();
             long cacheSize = result.getCacheBytes();
+            long dataSize = result.getDataBytes() - cacheSize;
 
             if (dataSize <= 0 || !mCanClearData || mDataCleared) {
                 mClearDataButton.setEnabled(false);
diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java
index 45ece6e..3626fab 100644
--- a/src/com/android/settings/applications/AppStorageSizesController.java
+++ b/src/com/android/settings/applications/AppStorageSizesController.java
@@ -70,7 +70,8 @@
             mTotalSize.setSummary(errorRes);
         } else {
             long codeSize = mLastResult.getCodeBytes();
-            long dataSize = mDataCleared ? 0 : mLastResult.getDataBytes();
+            long dataSize =
+                    mDataCleared ? 0 : mLastResult.getDataBytes() - mLastResult.getCacheBytes();
             if (mLastCodeSize != codeSize) {
                 mLastCodeSize = codeSize;
                 mAppSize.setSummary(getSizeStr(context, codeSize));
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index be3bdfa..76129b7 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -418,14 +418,14 @@
             mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
         }
 
-        AppFilter overrideFilter = getOverrideFilter(mListType, mStorageType, mVolumeUuid);
-        if (overrideFilter != null) {
-            mApplications.setOverrideFilter(overrideFilter);
+        AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
+        if (compositeFilter != null) {
+            mApplications.setCompositeFilter(compositeFilter);
         }
     }
 
     @VisibleForTesting
-    static @Nullable AppFilter getOverrideFilter(int listType, int storageType, String volumeUuid) {
+    static @Nullable AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) {
         AppFilter filter = new VolumeFilter(volumeUuid);
         if (listType == LIST_TYPE_STORAGE) {
             if (storageType == STORAGE_TYPE_MUSIC) {
@@ -845,7 +845,7 @@
         private int mWhichSize = SIZE_TOTAL;
         CharSequence mCurFilterPrefix;
         private PackageManager mPm;
-        private AppFilter mOverrideFilter;
+        private AppFilter mCompositeFilter;
         private boolean mHasReceivedLoadEntries;
         private boolean mHasReceivedBridgeCallback;
         private FileViewHolderController mExtraViewController;
@@ -909,8 +909,8 @@
             }
         }
 
-        public void setOverrideFilter(AppFilter overrideFilter) {
-            mOverrideFilter = overrideFilter;
+        public void setCompositeFilter(AppFilter compositeFilter) {
+            mCompositeFilter = compositeFilter;
             rebuild(true);
         }
 
@@ -988,8 +988,8 @@
                 mWhichSize = SIZE_INTERNAL;
             }
             filterObj = FILTERS[mFilterMode];
-            if (mOverrideFilter != null) {
-                filterObj = mOverrideFilter;
+            if (mCompositeFilter != null) {
+                filterObj = new CompoundFilter(filterObj, mCompositeFilter);
             }
             if (!mManageApplications.mShowSystem) {
                 if (LIST_TYPES_WITH_INSTANT.contains(mManageApplications.mListType)) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
index 038267b..dca7ad1 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
@@ -63,13 +63,15 @@
             }
 
             final String summary;
+            boolean enabled = true;
             if (mustSupportManagedProfile && !launcherHasManagedProfilesFeature(resolveInfo)) {
                 summary = getContext().getString(R.string.home_work_profile_not_supported);
+                enabled = false;
             } else {
                 summary = null;
             }
             final DefaultAppInfo candidate =
-                    new DefaultAppInfo(mPm, mUserId, activityName, summary);
+                    new DefaultAppInfo(mPm, mUserId, activityName, summary, enabled);
             candidates.add(candidate);
         }
         return candidates;
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 4974f78..13b3d0b 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -131,7 +131,7 @@
             }
         }
 
-        mPreferenceController.onLoadFinished(mAppsResult.get(UserHandle.myUserId()));
+        mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
         updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
 
         // setLoading always causes a flicker, so let's avoid doing it.
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
index 7e2d941..dee6793 100644
--- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -120,7 +120,8 @@
     @Override
     public void onLoadFinished(Loader<SparseArray<AppsStorageResult>> loader,
             SparseArray<AppsStorageResult> result) {
-        mPreferenceController.onLoadFinished(scrubAppsFromResult(result.get(mUserId)));
+        scrubAppsFromResult(result.get(mUserId));
+        mPreferenceController.onLoadFinished(result, mUserId);
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
index 8652804..74474b3 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
@@ -22,8 +22,8 @@
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.UserInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.util.Log;
 import android.util.SparseArray;
@@ -87,45 +87,43 @@
                 stats = mStatsManager.getStatsForPackage(mUuid, app.packageName, myUser);
             } catch (NameNotFoundException | IOException e) {
                 // This may happen if the package was removed during our calculation.
-                Log.w("App unexpectedly not found", e);
+                Log.w(TAG, "App unexpectedly not found", e);
                 continue;
             }
 
-            long attributedAppSizeInBytes = stats.getDataBytes();
-            // This matches how the package manager calculates sizes -- by zeroing out code sizes of
-            // system apps which are not updated. My initial tests suggest that this results in the
-            // original code size being counted for updated system apps when they shouldn't, but
-            // I am not sure how to avoid this problem without specifically going in to find that
-            // code size.
-            if (!app.isSystemApp() || app.isUpdatedSystemApp()) {
-                attributedAppSizeInBytes += stats.getCodeBytes();
-            } else {
-                result.systemSize += stats.getCodeBytes();
+            long blamedSize = stats.getDataBytes() - stats.getCacheBytes();
+
+            // Only count app code against the current user; we don't want
+            // double-counting on multi-user devices.
+            if (userId == UserHandle.myUserId()) {
+                blamedSize += stats.getCodeBytes();
             }
+
             switch (app.category) {
                 case CATEGORY_GAME:
-                    result.gamesSize += attributedAppSizeInBytes;
+                    result.gamesSize += blamedSize;
                     break;
                 case CATEGORY_AUDIO:
-                    result.musicAppsSize += attributedAppSizeInBytes;
+                    result.musicAppsSize += blamedSize;
                     break;
                 case CATEGORY_VIDEO:
-                    result.videoAppsSize += attributedAppSizeInBytes;
+                    result.videoAppsSize += blamedSize;
                     break;
                 default:
                     // The deprecated game flag does not set the category.
                     if ((app.flags & ApplicationInfo.FLAG_IS_GAME) != 0) {
-                        result.gamesSize += attributedAppSizeInBytes;
+                        result.gamesSize += blamedSize;
                         break;
                     }
-                    result.otherAppsSize += attributedAppSizeInBytes;
+                    result.otherAppsSize += blamedSize;
                     break;
             }
         }
 
         Log.d(TAG, "Loading external stats");
         try {
-            result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(userId));
+            result.externalStats = mStatsManager.getExternalStorageStats(mUuid,
+                    UserHandle.of(userId));
         } catch (IOException e) {
             Log.w(TAG, e);
         }
@@ -142,7 +140,6 @@
         public long musicAppsSize;
         public long videoAppsSize;
         public long otherAppsSize;
-        public long systemSize;
         public StorageStatsSource.ExternalStorageStats externalStats;
     }
 
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index f8df375..cebd114 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -23,6 +23,7 @@
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.net.TrafficStats;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.storage.VolumeInfo;
@@ -30,6 +31,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
+import android.util.SparseArray;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -237,7 +239,10 @@
         setFilesPreferenceVisibility();
     }
 
-    public void onLoadFinished(StorageAsyncLoader.AppsStorageResult data) {
+    public void onLoadFinished(SparseArray<StorageAsyncLoader.AppsStorageResult> result,
+            int userId) {
+        final StorageAsyncLoader.AppsStorageResult data = result.get(userId);
+
         // TODO(b/35927909): Figure out how to split out apps which are only installed for work
         //       profiles in order to attribute those app's code bytes only to that profile.
         mPhotoPreference.setStorageSize(
@@ -248,23 +253,30 @@
         mMoviesPreference.setStorageSize(data.videoAppsSize, mTotalSize);
         mAppPreference.setStorageSize(data.otherAppsSize, mTotalSize);
 
-        long unattributedExternalBytes =
+        long otherExternalBytes =
                 data.externalStats.totalBytes
                         - data.externalStats.audioBytes
                         - data.externalStats.videoBytes
-                        - data.externalStats.imageBytes;
-        mFilePreference.setStorageSize(unattributedExternalBytes, mTotalSize);
+                        - data.externalStats.imageBytes
+                        - data.externalStats.appBytes;
+        mFilePreference.setStorageSize(otherExternalBytes, mTotalSize);
 
-        // We define the system size as everything we can't classify.
         if (mSystemPreference != null) {
-            mSystemPreference.setStorageSize(
-                    mUsedBytes
-                            - data.externalStats.totalBytes
-                            - data.musicAppsSize
-                            - data.gamesSize
-                            - data.videoAppsSize
-                            - data.otherAppsSize,
-                    mTotalSize);
+            // Everything else that hasn't already been attributed is tracked as
+            // belonging to system.
+            long attributedSize = 0;
+            for (int i = 0; i < result.size(); i++) {
+                final StorageAsyncLoader.AppsStorageResult otherData = result.valueAt(i);
+                attributedSize += otherData.gamesSize
+                        + otherData.musicAppsSize
+                        + otherData.videoAppsSize
+                        + otherData.otherAppsSize;
+                attributedSize += otherData.externalStats.totalBytes
+                        - otherData.externalStats.appBytes;
+            }
+
+            final long systemSize = Math.max(TrafficStats.GB_IN_BYTES, mUsedBytes - attributedSize);
+            mSystemPreference.setStorageSize(systemSize, mTotalSize);
         }
     }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 8078ad6..7454c60 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -160,6 +160,14 @@
     }
 
     @Override
+    protected void onResume() {
+        super.onResume();
+        if (mSidecar != null) {
+            mSidecar.setListener(this);
+        }
+    }
+
+    @Override
     protected void onPause() {
         super.onPause();
         if (mSidecar != null) {
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 6cb5c64..70fb3d4 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -297,11 +297,26 @@
     }
 
     @Override
+    public Timer getBluetoothUnoptimizedScanTimer() {
+        return null;
+    }
+
+    @Override
+    public Timer getBluetoothUnoptimizedScanBackgroundTimer() {
+        return null;
+    }
+
+    @Override
     public Counter getBluetoothScanResultCounter() {
         return null;
     }
 
     @Override
+    public Counter getBluetoothScanResultBgCounter() {
+        return null;
+    }
+
+    @Override
     public long getWifiRadioApWakeupCount(int which) {
         return 0;
     }
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index 38afd16..a3cf10a 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -24,6 +24,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 
 import java.util.List;
@@ -41,10 +42,10 @@
         mAm = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
     }
 
-    /** Hide "Factory reset" settings for secondary users. */
+    /** Hide "Factory reset" settings for secondary users, except demo users. */
     @Override
     public boolean isAvailable() {
-        return mUm.isAdminUser();
+        return mUm.isAdminUser() || Utils.isCarrierDemoUser(mContext);
     }
 
     @Override
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 38fed94..7dacaf5 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -395,7 +395,10 @@
                     int wifiApState = wifiManager.getWifiApState();
                     if (desiredState && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
                                          (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
-                        wifiManager.setWifiApEnabled(null, false);
+                        final ConnectivityManager connectivityManager =
+                                (ConnectivityManager) context.getSystemService(
+                                        Context.CONNECTIVITY_SERVICE);
+                        connectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
                     }
 
                     wifiManager.setWifiEnabled(desiredState);
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index a5d922d..b3f83b3 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -224,7 +224,7 @@
         mConnectionDetailPref = screen.findPreference(KEY_CONNECTION_DETAIL_PREF);
 
         mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
-        mSignInButton = (Button) mButtonsPref.findViewById(R.id.right_button);
+        mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button);
         mSignInButton.setText(R.string.support_sign_in_button_text);
         mSignInButton.setOnClickListener(
             view -> mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork));
@@ -245,7 +245,7 @@
                 (PreferenceCategory) screen.findPreference(KEY_IPV6_ADDRESS_CATEGORY);
 
         mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
-        mForgetButton = (Button) mButtonsPref.findViewById(R.id.left_button);
+        mForgetButton = (Button) mButtonsPref.findViewById(R.id.forget_button);
         mForgetButton.setText(R.string.forget);
         mForgetButton.setOnClickListener(view -> forgetNetwork());
         updateInfo();
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index 36d78c1..e302edd 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -14,11 +14,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import com.android.settings.R;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -82,15 +80,15 @@
         when(result.getCodeBytes()).thenReturn(1L);
         when(result.getCacheBytes()).thenReturn(10L);
         when(result.getDataBytes()).thenReturn(100L);
-        when(result.getTotalBytes()).thenReturn(111L);
+        when(result.getTotalBytes()).thenReturn(101L);
 
         mController.setResult(result);
         mController.updateUi(mContext);
 
         assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
         assertThat(mCachePreference.getSummary()).isEqualTo("10.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("100B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("111B");
+        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
+        assertThat(mTotalPreference.getSummary()).isEqualTo("101B");
     }
 
     @Test
@@ -99,7 +97,7 @@
         when(result.getCodeBytes()).thenReturn(1L);
         when(result.getCacheBytes()).thenReturn(10L);
         when(result.getDataBytes()).thenReturn(100L);
-        when(result.getTotalBytes()).thenReturn(111L);
+        when(result.getTotalBytes()).thenReturn(101L);
 
         mController.setResult(result);
         mController.setCacheCleared(true);
@@ -107,8 +105,8 @@
 
         assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
         assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");
-        assertThat(mDataPreference.getSummary()).isEqualTo("100B");
-        assertThat(mTotalPreference.getSummary()).isEqualTo("101B");
+        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
+        assertThat(mTotalPreference.getSummary()).isEqualTo("91.00B");
     }
 
     @Test
@@ -117,7 +115,7 @@
         when(result.getCodeBytes()).thenReturn(1L);
         when(result.getCacheBytes()).thenReturn(10L);
         when(result.getDataBytes()).thenReturn(100L);
-        when(result.getTotalBytes()).thenReturn(111L);
+        when(result.getTotalBytes()).thenReturn(101L);
 
         mController.setResult(result);
         mController.setDataCleared(true);
diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
index 6440141..779e0b6 100644
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
@@ -83,7 +83,7 @@
     @Test
     public void storageShouldRepresentStorageStatsQuery() throws Exception {
         when(mSource.getExternalStorageStats(any(String.class), any(UserHandle.class))).thenReturn(
-                new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0));
+                new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
 
         mController.queryStats();
         mController.setupView(mHolder);
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index 38104a9..f425d2f 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -16,11 +16,17 @@
 
 package com.android.settings.applications.defaultapps;
 
-
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.os.Build;
 import android.os.UserManager;
 
 import com.android.settings.SettingsRobolectricTestRunner;
@@ -33,14 +39,22 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyList;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -55,7 +69,9 @@
     @Mock
     private UserManager mUserManager;
     @Mock
-    private PackageManagerWrapper mPackageManager;
+    private PackageManagerWrapper mPackageManagerWrapper;
+    @Mock
+    private PackageManager mPackageManager;
 
     private DefaultHomePicker mPicker;
 
@@ -63,28 +79,89 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
 
-        mPicker = new DefaultHomePicker();
+        mPicker = spy(new DefaultHomePicker());
         mPicker.onAttach((Context) mActivity);
 
-        ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
+        ReflectionHelpers.setField(mPicker, "mPm", mPackageManagerWrapper);
+        doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
     }
 
     @Test
     public void setDefaultAppKey_shouldUpdateDefault() {
         assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
 
-        verify(mPackageManager).replacePreferredActivity(any(IntentFilter.class),
+        verify(mPackageManagerWrapper).replacePreferredActivity(any(IntentFilter.class),
                 anyInt(), any(ComponentName[].class), any(ComponentName.class));
     }
 
     @Test
     public void getDefaultAppKey_shouldReturnDefault() {
         final ComponentName cn = mock(ComponentName.class);
-        when(mPackageManager.getHomeActivities(anyList()))
+        when(mPackageManagerWrapper.getHomeActivities(anyList()))
                 .thenReturn(cn);
         mPicker.getDefaultKey();
         verify(cn).flattenToString();
     }
 
+    @Test
+    public void getCandidates_allLaunchersAvailableIfNoManagedProfile()
+            throws NameNotFoundException {
+        addLaunchers();
+        List<DefaultAppInfo> candidates = mPicker.getCandidates();
+        assertThat(candidates.size()).isEqualTo(2);
+        assertThat(candidates.get(0).summary).isNull();
+        assertThat(candidates.get(0).enabled).isTrue();
+        assertThat(candidates.get(1).summary).isNull();
+        assertThat(candidates.get(1).enabled).isTrue();
+    }
+
+    @Test
+    public void getCandidates_onlyLollipopPlusLaunchersAvailableIfManagedProfile()
+            throws NameNotFoundException {
+        createManagedProfile();
+        addLaunchers();
+        List<DefaultAppInfo> candidates = mPicker.getCandidates();
+        assertThat(candidates.size()).isEqualTo(2);
+        DefaultAppInfo lollipopPlusLauncher = candidates.get(0);
+        assertThat(lollipopPlusLauncher.summary).isNull();
+        assertThat(lollipopPlusLauncher.enabled).isTrue();
+
+        DefaultAppInfo preLollipopLauncher = candidates.get(1);
+        assertThat(preLollipopLauncher.summary).isNotNull();
+        assertThat(preLollipopLauncher.enabled).isFalse();
+    }
+
+    private void createManagedProfile() {
+        ArrayList<UserInfo> profiles = new ArrayList<UserInfo>();
+        profiles.add(new UserInfo(/*id=*/ 10, "TestUserName", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mUserManager.getProfiles(anyInt())).thenReturn(profiles);
+    }
+
+    private ResolveInfo createLauncher(
+            String packageName, String className, int targetSdk) throws NameNotFoundException {
+        ResolveInfo launcher = new ResolveInfo();
+        launcher.activityInfo = new ActivityInfo();
+        launcher.activityInfo.packageName = packageName;
+        launcher.activityInfo.name = className;
+        ApplicationInfo launcherAppInfo = new ApplicationInfo();
+        launcherAppInfo.targetSdkVersion = targetSdk;
+        when(mPackageManager.getApplicationInfo(eq(launcher.activityInfo.packageName), anyInt()))
+                .thenReturn(launcherAppInfo);
+        return launcher;
+    }
+
+    private void addLaunchers() throws NameNotFoundException {
+        doAnswer(invocation -> {
+                // The result of this method is stored in the first parameter...
+                List<ResolveInfo> parameter = (List<ResolveInfo>) invocation.getArguments()[0];
+                parameter.add(createLauncher(
+                        "package.1", "LollipopPlusLauncher", Build.VERSION_CODES.LOLLIPOP));
+                parameter.add(createLauncher(
+                        "package.2", "PreLollipopLauncher", Build.VERSION_CODES.KITKAT));
+                return null;
+                })
+                .when(mPackageManagerWrapper).getHomeActivities(anyList());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index 8d48e63..03f15bb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -31,11 +32,16 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class StorageProfileFragmentTest {
+    @Captor
+    private ArgumentCaptor<SparseArray<StorageAsyncLoader.AppsStorageResult>> mCaptor;
+
     @Test
     public void verifyAppSizesAreZeroedOut() {
         StorageItemPreferenceController controller = mock(StorageItemPreferenceController.class);
@@ -45,18 +51,17 @@
         result.otherAppsSize = 200;
         result.gamesSize = 300;
         result.videoAppsSize = 400;
-        result.externalStats = new StorageStatsSource.ExternalStorageStats(6, 1, 2, 3);
+        result.externalStats = new StorageStatsSource.ExternalStorageStats(6, 1, 2, 3, 0);
         SparseArray<StorageAsyncLoader.AppsStorageResult> resultsArray = new SparseArray<>();
         resultsArray.put(0, result);
         fragment.setPreferenceController(controller);
 
         fragment.onLoadFinished(null, resultsArray);
 
-        ArgumentCaptor<StorageAsyncLoader.AppsStorageResult> resultCaptor = ArgumentCaptor.forClass(
-                StorageAsyncLoader.AppsStorageResult.class);
-        verify(controller).onLoadFinished(resultCaptor.capture());
+        MockitoAnnotations.initMocks(this);
+        verify(controller).onLoadFinished(mCaptor.capture(), anyInt());
 
-        StorageAsyncLoader.AppsStorageResult extractedResult = resultCaptor.getValue();
+        StorageAsyncLoader.AppsStorageResult extractedResult = mCaptor.getValue().get(0);
         assertThat(extractedResult.musicAppsSize).isEqualTo(0);
         assertThat(extractedResult.videoAppsSize).isEqualTo(0);
         assertThat(extractedResult.otherAppsSize).isEqualTo(0);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index 32def69..dc1c286 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -168,7 +168,7 @@
                         MEGABYTE_IN_BYTES * 30,
                         MEGABYTE_IN_BYTES * 10,
                         MEGABYTE_IN_BYTES * 10,
-                        MEGABYTE_IN_BYTES * 10);
+                        MEGABYTE_IN_BYTES * 10, 0);
         result.put(10, userResult);
 
         mController.handleResult(result);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index e8057a6..3ad3783 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -28,7 +28,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
@@ -36,6 +35,7 @@
 import android.os.UserHandle;
 import android.os.storage.VolumeInfo;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -275,22 +275,22 @@
         result.videoAppsSize = MEGABYTE_IN_BYTES * 160;
         result.musicAppsSize = MEGABYTE_IN_BYTES * 40;
         result.otherAppsSize = MEGABYTE_IN_BYTES * 90;
-        result.systemSize = MEGABYTE_IN_BYTES * 100; // This value is ignored and overridden now.
         result.externalStats =
                 new StorageStatsSource.ExternalStorageStats(
                         MEGABYTE_IN_BYTES * 500, // total
                         MEGABYTE_IN_BYTES * 100, // audio
                         MEGABYTE_IN_BYTES * 150, // video
-                        MEGABYTE_IN_BYTES * 200); // image
+                        MEGABYTE_IN_BYTES * 200, 0); // image
 
-        mController.onLoadFinished(result);
+        SparseArray<StorageAsyncLoader.AppsStorageResult> results = new SparseArray<>();
+        results.put(0, result);
+        mController.onLoadFinished(results, 0);
 
         assertThat(audio.getSummary().toString()).isEqualTo("0.14GB");
         assertThat(image.getSummary().toString()).isEqualTo("0.35GB");
         assertThat(games.getSummary().toString()).isEqualTo("0.08GB");
         assertThat(movies.getSummary().toString()).isEqualTo("0.16GB");
         assertThat(apps.getSummary().toString()).isEqualTo("0.09GB");
-        assertThat(system.getSummary().toString()).isEqualTo("0.10GB");
         assertThat(files.getSummary().toString()).isEqualTo("0.05GB");
     }
 
@@ -488,4 +488,4 @@
 
         verify(screen).addPreference(files);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index 8b7110d..2199824 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -114,7 +114,7 @@
                         99 * MEGABYTE_IN_BYTES,
                         33 * MEGABYTE_IN_BYTES,
                         33 * MEGABYTE_IN_BYTES,
-                        33 * MEGABYTE_IN_BYTES);
+                        33 * MEGABYTE_IN_BYTES, 0);
         result.put(10, userResult);
 
         mController.handleResult(result);
@@ -141,4 +141,4 @@
         Preference preference = argumentCaptor.getValue();
         assertThat(preference.getIcon()).isEqualTo(drawable);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index 1d15b42..bf0005c 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -22,10 +22,14 @@
 import android.accounts.AccountManager;
 import android.content.Context;
 import android.os.UserManager;
+import android.provider.Settings;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settings.testutils.shadow.ShadowUtils;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,7 +37,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class FactoryResetPreferenceControllerTest {
@@ -57,6 +60,11 @@
         mController = new FactoryResetPreferenceController(mContext);
     }
 
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+    }
+
     @Test
     public void isAvailable_systemUser() {
         when(mUserManager.isAdminUser()).thenReturn(true);
@@ -65,13 +73,29 @@
     }
 
     @Test
+    @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
     public void isAvailable_nonSystemUser() {
         when(mUserManager.isAdminUser()).thenReturn(false);
+        ShadowUtils.setIsCarrierDemoUser(false);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
+    @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
+    public void isAvailable_carrierDemoUser() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        ShadowUtils.setIsCarrierDemoUser(true);
+
+        final String carrierDemoModeSetting = "carrier_demo_mode";
+        when(mContext.getString(com.android.internal.R.string.config_carrierDemoModeSetting))
+                .thenReturn(carrierDemoModeSetting);
+        Settings.Secure.putInt(null, carrierDemoModeSetting, 1);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
     public void getPreferenceKey() {
         assertThat(mController.getPreferenceKey()).isEqualTo(FACTORY_RESET_KEY);
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
index 87b9103..208fae3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -28,6 +28,7 @@
 public class ShadowUtils {
 
     private static IFingerprintManager sFingerprintManager = null;
+    private static boolean sIsCarrierDemoUser;
 
     @Implementation
     public static int enforceSameOwner(Context context, int userId) {
@@ -45,10 +46,20 @@
 
     public static void reset() {
         sFingerprintManager = null;
+        sIsCarrierDemoUser = false;
     }
 
     @Implementation
     public static boolean isWifiOnly(Context context) {
         return true;
     }
+
+    public static void setIsCarrierDemoUser(boolean isCarrierDemoUser) {
+        sIsCarrierDemoUser = isCarrierDemoUser;
+    }
+
+    @Implementation
+    public static boolean isCarrierDemoUser(Context context) {
+        return sIsCarrierDemoUser;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 208c157..0298195 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -195,9 +195,9 @@
                 .thenReturn(mockConnectionDetailPref);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
                 .thenReturn(mockButtonsPref);
-        when(mockButtonsPref.findViewById(R.id.left_button))
+        when(mockButtonsPref.findViewById(R.id.forget_button))
                 .thenReturn(mockForgetButton);
-        when(mockButtonsPref.findViewById(R.id.right_button))
+        when(mockButtonsPref.findViewById(R.id.signin_button))
                 .thenReturn(mockSignInButton);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
                 .thenReturn(mockSignalStrengthPref);
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
index 92e556e..d207701 100644
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
@@ -22,16 +22,20 @@
 
 import android.content.pm.ApplicationInfo;
 
+import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
+import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+import java.lang.reflect.Field;
 import org.junit.Test;
 
 public class ManageApplicationsTest {
     @Test
-    public void getOverrideFilter_filtersVolumeForAudio() {
+    public void getCompositeFilter_filtersVolumeForAudio() {
         AppFilter filter =
-                ManageApplications.getOverrideFilter(
+                ManageApplications.getCompositeFilter(
                         ManageApplications.LIST_TYPE_STORAGE,
                         ManageApplications.STORAGE_TYPE_MUSIC,
                         "uuid");
@@ -45,9 +49,9 @@
     }
 
     @Test
-    public void getOverrideFilter_filtersVolumeForVideo() {
+    public void getCompositeFilter_filtersVolumeForVideo() {
         AppFilter filter =
-                ManageApplications.getOverrideFilter(
+                ManageApplications.getCompositeFilter(
                         ManageApplications.LIST_TYPE_MOVIES,
                         ManageApplications.STORAGE_TYPE_DEFAULT,
                         "uuid");
@@ -61,9 +65,9 @@
     }
 
     @Test
-    public void getOverrideFilter_filtersVolumeForGames() {
+    public void getCompositeFilter_filtersVolumeForGames() {
         ApplicationsState.AppFilter filter =
-                ManageApplications.getOverrideFilter(
+                ManageApplications.getCompositeFilter(
                         ManageApplications.LIST_TYPE_GAMES,
                         ManageApplications.STORAGE_TYPE_DEFAULT,
                         "uuid");
@@ -77,12 +81,35 @@
     }
 
     @Test
-    public void getOverrideFilter_isEmptyNormally() {
+    public void getCompositeFilter_isEmptyNormally() {
         ApplicationsState.AppFilter filter =
-                ManageApplications.getOverrideFilter(
+                ManageApplications.getCompositeFilter(
                         ManageApplications.LIST_TYPE_MAIN,
                         ManageApplications.STORAGE_TYPE_DEFAULT,
                         "uuid");
         assertThat(filter).isNull();
     }
+
+    @Test
+    public void getCompositeFilter_worksWithInstantApps() throws Exception {
+        Field field = AppUtils.class.getDeclaredField("sInstantAppDataProvider");
+        field.setAccessible(true);
+        field.set(AppUtils.class, (InstantAppDataProvider) (i -> true));
+
+        AppFilter filter =
+            ManageApplications.getCompositeFilter(
+                ManageApplications.LIST_TYPE_STORAGE,
+                ManageApplications.STORAGE_TYPE_MUSIC,
+                "uuid");
+        AppFilter composedFilter = new CompoundFilter(ApplicationsState.FILTER_INSTANT, filter);
+
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_AUDIO;
+        info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(composedFilter.filterApp(appEntry)).isTrue();
+    }
 }
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 546ea4b..79a4595 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -133,9 +133,9 @@
         info.id = SECONDARY_USER_ID;
         mUsers.add(info);
         when(mSource.getExternalStorageStats(anyString(), eq(UserHandle.SYSTEM)))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4));
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4, 0));
         when(mSource.getExternalStorageStats(anyString(), eq(new UserHandle(SECONDARY_USER_ID))))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4));
+                .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4, 0));
 
         SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
 
@@ -145,19 +145,6 @@
     }
 
     @Test
-    public void testSystemAppsBaseSizeIsAddedToSystem() throws Exception {
-        ApplicationInfo systemApp =
-                addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
-        systemApp.flags = ApplicationInfo.FLAG_SYSTEM;
-
-        SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(10L);
-        assertThat(result.get(PRIMARY_USER_ID).systemSize).isEqualTo(1L);
-    }
-
-    @Test
     public void testUpdatedSystemAppCodeSizeIsCounted() throws Exception {
         ApplicationInfo systemApp =
                 addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);